Add ember-cli branch to build
Merge branch 'staging' of https://github.com/marclitchfield/thedebate-web into staging
Travis build