Added ability to specify device and dpi from child template
Merge branch 'master' of github.com:mmkiwi/rmarkdown