re-do catch-all aliases, fixes #107 (originally #104)

This reverts pull request #105 from jonessen96/master (84d2023f94a6b1f6d9b761ff0550789d629a665d) which was incorrect because it lost the "+" in DOT_ATOM_TEXT and so was not accepting any email addresses.

Am taking the opportunity to make the code cleaner while I'm here.