Added support for Mailplane and Gitbox
Merge branch 'master' of git://github.com/THEY/mackup into THEY-master
Polished @THEY contrib