Sketch of #201.
Merge forward and stop mis-using PortMap.
Typos.
Add docs.
Fix failing test.
Unicode!
Oxford comma
	modified:   docs/gettingstarted/index.rst
	new file:   docs/gettingstarted/mysql-application.yml
	new file:   docs/gettingstarted/mysql-deployment-moved.yml
	new file:   docs/gettingstarted/mysql-deployment.yml
	new file:   docs/gettingstarted/mysql-example.rst
	modified:   mysql-example.rst
	modified:   mysql-example.rst
	modified:   mysql-example.rst
	modified:   mysql-example.rst
Merge branch 'master' into docs-mysql-example-460

Conflicts:
	docs/gettingstarted/index.rst
	modified:   docs/gettingstarted/mysql-example.rst
	modified:   docs/gettingstarted/mysql-example.rst
Merge remote-tracking branch 'refs/remotes/origin/master' into config-internal-links-201

Conflicts:
	flocker/node/__init__.py
	flocker/node/_config.py
	flocker/node/_deploy.py
	flocker/node/_model.py
	flocker/node/test/test_config.py
	flocker/node/test/test_deploy.py
	flocker/node/test/test_model.py
Merge branch 'master' into docs-mysql-example-460
Merge branch 'docs-mysql-example-460' into doc-environment-variables-593
	modified:   docs/advanced/configuration.rst
	modified:   docs/advanced/whatsnew.rst
	modified:   docs/gettingstarted/mysql-application.yml
Remove marketing tasks