Think I'm doing this right?
Changed
I think this is right
Merge branch 'python3.1' of github.com:WyrdIn/wyrd-core into python3.1

Conflicts:
	nlp/parsers.py