changed vignette to markdown and html output
Merge branch 'knitr'

Conflicts:
	DESCRIPTION
removed old vignette