Merge pull request #170 from wesleylancel/master

Fix for task #365, change multimap gem location
Merge pull request #171 from wesleylancel/master

Add archived parameter to /api/conversations, #362
Standardize on 'gray' spelling
Upgrade bootstrap
Clean up the default colors of navbar and search bar
Move 'Help' nav item to dropdown
Fix navbar active background
Switch out the default navbar link color
Merge branch 'inbox-style'
Render the text as markdown instead of using the raw html
Break long urls in messages
Render markdown where the helper is available
Better render plaintext messages
Remove spec for feature that was removed
Merge branch 'scrub-incoming-messages'
Merge remote-tracking branch 'upstream/master'