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

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