do a bower update after deploy
fixed merge conflict for deploy.rb file