adds markdown to concept descriptions
Add test for markdown
improves test for markdown
fix conflicts
merge from upstream
merge with origin branch
remove whitespace - force Travis CI to run again
merge with upstream
update spec
Merge pull request #62 from steven-ferguson/markdown

adds markdown to concept descriptions

Fixes #43