Merge branch 'update-alfred-recipe' into mike-customizations

Conflicts:
	sprout-osx-apps/recipes/alfred.rb
	sprout-osx-settings/attributes/dock_preferences.rb