deal with punctuation slightly better. still needs a re-write
Merge branch 'master' of github.com:srubin/p2fa-steve