First attempt at migration to sails v0.10...
Minor fixes
Merge branch 'sails-migration'