update berksfile dependencies
Add berkshelf:upload rake task

for use on travis post-build-success
Add travis after_success step to deploy cookbooks to chef
Merge branch 'refs/heads/master' into robots
Merge branch 'refs/heads/master' into robots

Conflicts:
	.travis.yml
	Rakefile
Merge branch 'refs/heads/master' into robots
Fix broken .travis.yml
Don't upload on PRs
Merge branch 'robots' of github.com:theodi/chef-odi-monitoring into robots
Install berks
Merge branch 'refs/heads/master' into robots
Merge branch 'master' of github.com:theodi/chef-odi-monitoring into robots

Conflicts:
	.travis.yml
	Berksfile
	Berksfile.lock
Merge branch 'robots' of github.com:theodi/chef-odi-monitoring into robots
Merge pull request #1 from theodi/robots

Auto-deploy cookbooks to chef on successful build