Cleaned up dependencies, other minor improvements
Gemfile update