Cleanup Gemfile
More cleanup
Merge branch 'feature/cleanup-rails4.1.1' into develop