various updates
Merge branch 'master' of https://github.com/npchris/chef-memsql

* 'master' of https://github.com/npchris/chef-memsql:
  various updates

Conflicts:
	recipes/default.rb
Eh, it's just a blank line and I don't feel like changing my sublime
prefs.
..and back we go.