Add bundler to Gemfile
Revert some changes