update syntax
update Merge branch 'master' of github.com:yandod/engineyard-cakephp-deploy

Conflicts:
	before_bundle.rb