Some code cleanup
Added "lang=None" recognition back in
Changed bad lang to new type of error
Merge pull request #68 from kaitlinhuben/master

Code cleanup, added lang=None back in, and changed bad lang to new kind of error