Updates Gemfile
Reorganises specs