use php5-fpm rather than our own custom launcher script for PHP+FastCGI
simplify zpush configuration files, no need to preserve copyright message
zpush/owncloud: inject mail using 'sendmail' not SMTP
keep Roundcube working too, put owncloud at /cloud rather than at /
tweak z-push/owncloud installation scripts: hide output, check if z-push needs an update, dont use /etc/timezone because its contents would need to be escaped before being passed into sed
automate more of the initial configuration
Merge branch 'master' into owncloud (php5-fpm)
Merge branch 'owncloud' of github.com:jkaberg/mailinabox into owncloud

Conflicts:
	conf/nginx.conf
	setup/zpush.sh
more owncloud configuration tweaks