fix credentials for oauth2 server
don't delete stuff from config
Added rake tasks for setting up for the demo
Merge remote-tracking branch 'ssayer/develop'