Merge branch 'master' into knitr

- merged in CDSC branding from the master branch

paper_template/text.Rnw

@@ -1,12 +1,11 @@
 \documentclass[12pt]{memoir}
 
-% article-1 and article-2 styles were originally based on kieran healy's
-% templates
-\usepackage{mako-mem}
-\chapterstyle{article-2}
-
-% with article-3 \chapterstyle, change to: \pagestyle{memo}
-\pagestyle{mako-mem}
+\usepackage{cdsc-memoir}
+% there are two chapter styles: cdsc-article and cdsc-memo
+% memo assumes that you remove the "\\" and the email address from the
+% \author field below as well as that you will comment out the
+% \published tag
+\chapterstyle{cdsc-article}
 
 \usepackage[utf8]{inputenc}
 \usepackage{wrapfig}
@@ -72,11 +71,11 @@ source("resources/preamble.R")
 % will add version control information to the bottom of each page. This can be
 % useful for keeping track of which version of a document somebody has:
 % \input{vc}
-% \pagestyle{mako-mem-git}
+% \pagestyle{cdsc-page-git}
 
 % LATEX NOTE: this alternative line will just input a timestamp at the
 % build process, useful for sharelatex
-% \pagestyle{mako-mem-sharelatex}
+% \pagestyle{cdsc-page-sharelatex}
 
 \begin{document}