Update socode.py
Merge branch 'master' of git://github.com/jhgaylor/socode into jhgaylor-master

Conflicts:
	socode.py
Merge branch 'master' of github.com:sricola/socode