make heroku happy with devise key?
misc changes?