Merge pull request #158 from cbare/develop

Fixes for adding charset to content-type and accept headers
added markdown mimetype mapping