Fixed gpg import by readding parse_import method.
Stopped tests from messing with user keychain.

- Reenforded using of keychain under testing/gpg-keyring for tests
Merge pull request #718 from codeburg/fix_gpg_key_import

Fix gpg key import
Improved nicer_text extension to trim out multiple blank lines in message
Started implementing rough code for adding Attachments to messages, added Plupload lib
Added more icons to theme settings
Include Plupload in HTML
Made Composer more robust for reseting IDs (after saving ephemeral) via .has-mid class
Got rudimentary support for attachments behaving semi-decently in the UI #715
Pushing up CSS updates and such
Added an else state for empty HTML messages with a nice message
Use UID form of IMAP4 commands, avoid timeouts on large mail (issue #709)
Clean up and refactor how mailbox IDs are generated/handled
Basic IMAP read-only mode works (issue #709)
More mailbox ID formatting fixes
Fixing broken PGP signatures