Trying to make this look a little better
Merge branch 'staging' of https://github.com/marclitchfield/thedebate into staging
Travis build