Rename hyphen-py to xkcd.py, add other XKCD substitutions.
Also actuwlly do the change even if -ass isn't in the message
more xkcd fixes