Cut 1.7.4
Merge branch '1.7' into 1.8
Cut 1.8.4
Formatting to match master
Merge branch '1.7' into 1.8
Merge branch '1.8'

Conflicts:
	sites/www/changelog.rst
Cut 1.9
Gah
Merge branch '1.7' into 1.8

Conflicts:
	fabric/version.py
Gah part 2
Merge branch '1.8' into 1.9
Gah part 3
Merge remote-tracking branch 'upstream/master'