mod
Merge branch 'master' of github.com:piglovesyou/chef-devenv

Conflicts:
	site-cookbooks/desktopapps/recipes/default.rb
	site-cookbooks/system/recipes/default.rb