make and \inputfile with latexmk so that we get better error messages and more reliable builds (hopefully)
add support for .Rmd and .Rtex files
Merge branch 'master' into grunt-init

Conflicts:
	root/makefile
	template.tex