Fix demo re #200
Fixed a typo in the license header of most files

Conflicts:
	paramiko/proxy.py
Merge branch '1.8' into 1.9
Merge branch '1.9' into 1.10