Allow site setup to run on existing directories in www
Allow easier control of WordPress versioning from vvv-init.sh
Merge branch 'directories' into develop

Conflicts:
	vvv
Merge branch 'version' into develop

Conflicts:
	vvv
Update version to 1.2.1