minor updates
Merge branch 'master' of https://github.com/pparadigm/whosin

Conflicts:
	whosin275.py