added markdown version of vignette
finished markdown vignette
Merge branch 'knitr-conversion'
Merge remote-tracking branch 'origin/master'