Add dock largesize setting
Merge branch 'master' into update-dock-preferences-recipe
Merge branch 'update-dock-preferences-recipe' into mike-customizations

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