Add note about develop branch to master branch readme
Change the delimiter in sed commands so forward slashes in the site URL doesn't break things
Update done_text calls in the teardown wizard
Merge branch 'bugfixes' into develop

Conflicts:
	vvv