Fix for #80#81

daniel-sullivan wants to merge 1 commit intojsonapi-rb:masterjsonapi-rb/jsonapi-serializable:masterfrom

daniel-sullivan:fix-for-conditionalsdaniel-sullivan/jsonapi-serializable:fix-for-conditionalsCopy head branch name to clipboard