Add type when association name is different than objects type
Merge pull request #709 from ride/add-type

Add type key when association name is different than object type