clean up some non-PEP-8 code
use class decorator to implement __str__
Merge branch 'master' of github.com:glyphobet/pottymouth