Changed rmarkdown to rmd.

(cherry picked from commit 945b86f6624c06d379e2da4d19c986666ae223ae)

Conflicts:
	Makefile
	rmd.mk
Replaying change to rmd.mk originally from commit:
	[commit 934ae6e1ac9942ea4a93a920eced268cc03b4b51]