Getting this to run on codeship

closes #11
Merge branch 'master' into js-passport