Fix builds
Merge branch 'master' of https://github.com/knownasilya/ember-browserify-test