updated for heroku deploy
Merge branch 'master' of github.com:kellyjandrews/ember-brunch