Merge pull request #260 from david-christiansen/master

Support displaying embedded errors in docstrings
Added badges for MELPA and MELPA Stable.

Give people direct links to the melpa and melpa stable repositories.
Merge pull request #261 from jfdm/improv/badges

Added badges for MELPA and MELPA Stable.