more gemfile tweaking
Merge branch 'test'