More Gemfile tweeks and file cleanup