updates and whotnot
"merging updates from remote to local"

Merge branch 'craziness' of github.com:stephenpurr/chef-browncow into craziness