Simplify requires in app.rb

Simplify requires in `app.rb`. Hopefully this will also make upstream merges a little more robust as currently any changes in this file tend to cause conflicts on everything.

Depends on #43.