conditionals in templates
third party apt packages
Merge branch 'master' of github.com:mmarschall/chef-repo

Conflicts:
	cookbooks/my_cookbook/recipes/default.rb