Refactoring
Merge branch 'master' of github.com:averell23/chef-repo

Conflicts:
	Cheffile
	Cheffile.lock
	cookbooks/rails_install/README.md
	cookbooks/rails_install/attributes/default.rb
	cookbooks/rails_install/metadata.rb
	cookbooks/rails_install/recipes/default.rb