Fixed weird formatting error that *might* be causing Issue #1340?
Merge branch 'associations' of github.com:Latros/sails into associations