Merge branch 'release/1.2'

Conflicts:
	README.md
	confab/conffiles.py
	confab/model.py
	confab/tests/test_generate.py
	confab/tests/test_model.py
	setup.py
Merge branch 'release/1.3'

Conflicts:
	README.md
	setup.py
Merge branch 'release/1.4'
Merge branch 'release/1.5'
Merge branch 'release/1.6'
Merge branch 'release/1.7'
Don't let `this_hostname` change user or identity file.

This runs into problems with some user ssh configurations that rely on Fabric's command line
"-u" or "-i" overriding the ssh configuration.
Merge branch 'hotfix/1.7.1' into develop