Fix horrible typo
Expand user in upload_template.
Added _expand_path routine - expand paths with tilde (~) inside. Fixed #367.
Fixed contrib tests after #367 patch.
Updated changelog.
Added missing _expand_path call in (non-GNU) sed.
Initial stab at contrib tests + Travis SSH
Activate localhost connections in integration
Fix up tests + ssh stuff
Need non-under-test stuff to escape
Fix up template crap to not use same name locally hurr
Abort when env.hosts=<str> re #861
Merge branch '860-int' into 1.6
Changelog re #861
Switch up re #681 to be nice and not complain
Merge branch '861-int' into 1.6

Conflicts:
	docs/changelog.rst
Refactored sed routine.
Fixed problem with missing -r flag (extended regexp) in Mac OS X sed version.
Updated changelog.
Merge branch '863-int' into 1.6

Conflicts:
	docs/changelog.rst