Merge pull request #1 from balderdashy/master

Update
Fix funky spaces/tabs mixing
Merge pull request #2425 from MCProHosting/master

Fix funky spaces/tabs mixing
Merge branch 'master' of https://github.com/balderdashy/sails into sails

* 'master' of https://github.com/balderdashy/sails:
  Fix funky spaces/tabs mixing