hopperator code plus others
Merge branch 'master' of git://github.com/jgullive/499

Conflicts:
	io.pyc