app_service_home and ganglia new
cookbook gulp and op5 changes
Merge branch 'master' of https://github.com/thomasalrin/chef-repo into thomasalrin-master

Conflicts:
	cookbooks/megam_gulp/recipes/default.rb