oh god how was this overlooked for so long
Merge branch '1.6'
Doc format tweak
Fix function unwrapping - harcoding bad! BAD!
Merge branch '1.6'
versionadded for remote_tunnel
Merge branch '1.6'
Cut 1.6.2
Fixes to release junk
Merge branch '1.6'

Conflicts:
	docs/changelog.rst
Cut 1.7 final
Release script still needs work apparently
Bump dev version
Changelog format fix
Merge branch '1.7'
Attribution to that jerk @offbyone in 1.6 changelog
Merge branch '1.6' into 1.7

Conflicts:
	docs/changelog.rst
Merge branch '1.7'
Merge remote branch 'upstream/master'