Bring up to date with doorkeeper master

Doorkeeper has moved quite a bit since this application was set-up.  These changes bring it up to date with doorkeeper as of now (January 29, 2014).  Useful for a development branch if not the master branch.