Re-ordered Gemfile for pretteh-ness.
some refactoring