Fixes Chef-Solo
Merge branch 'master' of github.com:mbiermann/rocket-api

Conflicts:
	deployment/cookbooks/rocket-api/README.md
	deployment/cookbooks/rocket-api/attributes/default.rb
	deployment/cookbooks/rocket-api/attributes/server.rb
	deployment/cookbooks/rocket-api/data_bags/credentials/aws.json
	deployment/cookbooks/rocket-api/metadata.rb
	deployment/cookbooks/rocket-api/recipes/default.rb
	deployment/cookbooks/rocket-api/recipes/gom_packages.rb
	deployment/cookbooks/rocket-api/recipes/server.rb
	deployment/cookbooks/rocket-api/recipes/vagrant.rb
	deployment/cookbooks/rocket-api/roles/api.json
	deployment/cookbooks/rocket-api/templates/default/Gomfile.erb
	deployment/cookbooks/rocket-api/templates/default/config.json.erb
	deployment/cookbooks/rocket-api/templates/default/streambot-api.conf.erb