Saving changes for merge conflict
Merge branch 'master' of github.com:pagekite/Mailpile
Merge branch 'master' of github.com:pagekite/Mailpile
Merge branch 'master' of github.com:pagekite/Mailpile
Created compose and tags view
Added some HTMl to the compose page
Merge branch 'master' of github.com:pagekite/Mailpile
Merge branch 'master' of github.com:pagekite/Mailpile
Replaced Museo with Mailpile 300 weight font, updated CSS as per Issue #101
Merge branch 'master' of github.com:pagekite/Mailpile
Added padding and navigation on states to sidebar and sub nav
Moved message HTML and front-end logic out into view.html
1st draft of urlmap.py
Fixed an issue with control characters in subjects messing up the index file.
Updated webfonts with latest updates
Updated some CSS and HTML for view messages thread
Mailpile should read HTML templates not from the current working directory but rather from the directory within the source-tree if possible.
Updated webfont again
Progress on self-documenting UrlMap class
Merge branch 'master' of github.com:shartte/Mailpile into pull-zone