Cut 1.13.2
Merge branch '1.13' into 1.14

Conflicts:
	paramiko/__init__.py
	setup.py
Merge branch '1.14'
Cut 1.14.1
Merge branch '1.14'
Consolidate version info. Closes #249