Reverting to previous version of dependencies--couldn't get ember-cli 0.1.1 working.
Merge branch 'development' of https://github.com/marclitchfield/thedebate-web into development