Travis build
Merge branch 'master' of https://github.com/marclitchfield/thedebate
Regenerate credentials. Pull staging branch before build