fix unicorn service template, add bundle install, fix ruby 2.0.0 bundler
resolve merge conflict