server promise changes

Switch from mongoose-q and es6-promise to bluebird
Merge branch 'mongoose-bluebird'