setup runs now with python2
more python2 everywhere
Update MEM-STATS.TXT
Merge remote-tracking branch 'upstream/master'
Load vcards in the background on startup
Tweaking slightly the background vcard loading so it only happens in interactive mode
Merge pull request #330 from mkawalec/master

Setup runs correctly on distros that have switched to python3 or where python is in a different place
Adding plugin handlers for assets and body blocks
Symmetric encryption using openssl - first pass, bad error handling.
Merge pull request #331 from ngatnicdotmil/patch-8

Update MEM-STATS.TXT
Make mailpile auto-recognize the locale path
Fixes/enhances some translation strings

These fixes/enhancements were made by my experience (doubts) translating
mailpile to Brazilian Portuguese.
Update MEM-STATS.TXT
Fix tests
Manually merged in pull request 865203f993aeafce96f8a86c2b8aec1dde2e6c1a by @samfoo that adds sidebar scrolling & search view sizing
Updated CSS and latest changes to Thread view stuffs
Add flags to address info structs, report if an address is a contact (issue #263)
Update MEM-STATS.TXT
Adding os.path.basename to filename in keygen.
Avoid freaking out if sender is for some reason unknown