Fixing boilerplateissues
Merge branch 'development' of github.com:balderdashy/sails into development