cleanup
Merge branch 'master' of github.com:ryanhanks/chef-sublime-text

Conflicts:
	recipes/default.rb