Rename method
Simplified some ember routing stuff
Small test refactoring
Merge branch 'staging' of https://github.com/marclitchfield/thedebate-web into staging
Travis build