Upgrade 2.0

Upgrade to engineyard-2.0 from upstream and soften dependencies to play nicely with our app.