added php_user to help with servers where php user is not the same the web server
Merge branch 'master' of github.com:dnadesign/shipistrano

* 'master' of github.com:dnadesign/shipistrano:
  seems to be working quite well
  added exception for _html
  updated mysql_database

Conflicts:
	lib/shipistrano/helpers/silverstripe.rb