more example stuff
Merge branch 'master' into rails-instance

Conflicts:
	.chef/knife.rb
	Berksfile
	Berksfile.lock
merging
c
gitignore
ff
removed vendor