Refactor.
Merge branch 'associations' of github.com:balderdashy/sails into associations
Hopefully the last of the log fixes for now.