fix list rendering in README...again
rename `prototype' recipe to `base' recipes
fix error with git defaults that resulted in user names with spaces
being truncated`
anonymize examples in `settings.rb'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Vagrantfile
	cookbooks/base/recipes/default.rb
	settings.rb