Fix merge conflict cruft in dockerfile
Merge branch 'master' of https://github.com/marclitchfield/thedebate-web
Travis build