Finish rakefile and modify environment and gemfile
Fix merge conflicts