Worked on improved attachment UI feedback in Thread & Composer, #654
missing from last commit
Support attach-pgp-pubkey parameter on message create/update/send/etc.
Increase timeout for resetting 'Test route' check link

2s is too little, and often disappears too soon. Increase to
5 seconds.
Merge pull request #1060 from yuvipanda/increase-check-timeout

Increase timeout for resetting 'Test route' check link
Merge branch 'master' of github.com:pagekite/Mailpile
Merge branch 'master' into feature/run_in_subdirectory

Conflicts:
	static/default/html/partials/compose.html