Merge branch 'master' into develop
Update dependencies.
Don't need an override for mousetrap anymore (not using it!)
Change to LiveReload (in lieu of BrowserSync). We lose some stuff, but seems to work better with socket magic and sails.
A little more test coverage.
User API tests and better protect user.
Merge branch 'develop'