Fixed some paths.
Merge branch 'associations' of https://github.com/balderdashy/sails into associations

Conflicts:
	lib/app/index.js
Fixed some paths.