wip tagging enhancements, refs #7127, refs #6047
Merge branch 'dev' of github.com:nysenate/Bluebird-CRM into dev
adding some format stripping, fixes #7630
re-write a bunch inbound email for code readability
wip tagging, will break most of tagging
wip tagging, merge caused tab size changes