Updated capistrano deploy for ubuntu 14 and rdoc conflicts
Merge branch 'master' of https://github.com/aforward/chef-bootstrap