updating
Merge branch 'master' of git://github.com/bprater/socode into bprater-master

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

Conflicts:
	socode.py