Use plasticboy's vim-markdown plugin
Merge branch 'master' into laptop