expanded and cleaned up gemfile