Updated creation of the "associations" array for collections to add properties directly instead of using "merge"
Combined last two tests into one.
Merge branch 'master' of https://github.com/balderdashy/sails