Merge branch 'master' into knitr

moving both versions from color to xcolor

paper_template/text.Rtex

@@ -12,8 +12,6 @@
 
 <<init, echo=FALSE>>=
 knit_hooks$set(document = function(x) {
-  x <- sub('\\usepackage[]{color}',
-           '\\usepackage[usenames,dvipsnames]{color}', x, fixed = TRUE)
   x <- sub('\\usepackage[]{xcolor}',
            '\\usepackage[usenames,dvipsnames]{xcolor}', x, fixed = TRUE)
   x
@@ -39,6 +37,7 @@ source("resources/preamble.R")
 % \usepackage{endfloat}
 
 % import and customize urls
+\usepackage[usenames,dvipsnames]{xcolor}
 \usepackage[breaklinks]{hyperref}
 \hypersetup{colorlinks=true, linkcolor=Black, citecolor=Black, filecolor=Blue,
     urlcolor=Blue, unicode=true}