revert back to baseline
Merge branch 'master' of https://github.com/Yamo-Au/opsworks-cookbooks

Conflicts:
	wordpress/recipes/deploy.rb