Connect over ws
Merge branch 'master' of github.com:bmac/sails-ember-cli-test