Improved server Gemfile

- Merged with top level Gemfile
- Separated developement from deployment gems
- Tidied services Gemfile