fixed latest run merge

Merge branch 'master' of https://github.com/dataknut/MTUS

# Conflicts:
#	MTUS-W6-adult-survey-data-processing.html
#	MTUS-W6-adult-survey-data-processing.md

MTUS-W6-adult-survey-data-processing.html

@@ -9,7 +9,7 @@
 <meta name="generator" content="pandoc" />
 
 
-<meta name="author" content="Ben Anderson (b.anderson@soton.ac.uk/@dataknut)" />
+<meta name="author" content="Ben Anderson (b.anderson@soton.ac.uk, /@dataknut)" />
 
 
 <title>MTUS World 6 Survey Data Processing</title>
@@ -117,8 +117,8 @@ $(document).ready(function () {
 
 
 <h1 class="title toc-ignore">MTUS World 6 Survey Data Processing</h1>
-<h4 class="author"><em>Ben Anderson (<a href="mailto:b.anderson@soton.ac.uk/@dataknut">b.anderson@soton.ac.uk/@dataknut</a>)</em></h4>
-<h4 class="date"><em>Last run at: 2017-05-19 16:26:45</em></h4>
+<h4 class="author"><em>Ben Anderson (<a href="mailto:b.anderson@soton.ac.uk">b.anderson@soton.ac.uk</a>, <a href="mailto:/@dataknut">/@dataknut</a>)</em></h4>
+<h4 class="date"><em>Last run at: 2017-05-20 09:46:37</em></h4>
 
 </div>
 
@@ -2803,7 +2803,7 @@ pub_etc &lt;- lm(main39 ~ survey + mtus_month + ba_age_r + ba_nchild + hhtype, d
 </div>
 <div id="about" class="section level1">
 <h1><span class="header-section-number">9</span> About</h1>
-<p>Analysis completed in: 34.242 seconds using <a href="https://cran.r-project.org/package=knitr">knitr</a> in <a href="http://www.rstudio.com">RStudio</a>.</p>
+<p>Analysis completed in: 40.928 seconds using <a href="https://cran.r-project.org/package=knitr">knitr</a> in <a href="http://www.rstudio.com">RStudio</a>.</p>
 </div>
 <div id="references" class="section level1 unnumbered">
 <h1>References</h1>

MTUS-W6-adult-survey-data-processing.md

 # MTUS World 6 Survey Data Processing
-Ben Anderson (b.anderson@soton.ac.uk/@dataknut)  
+Ben Anderson (b.anderson@soton.ac.uk, /@dataknut)  
 Last run at: `r Sys.time()`  
 
 
@@ -1439,6 +1439,6 @@ On the basis of these results we seem justified in assuming that we can pool 198
 
 # About
 
-Analysis completed in: 34.242 seconds using [knitr](https://cran.r-project.org/package=knitr) in [RStudio](http://www.rstudio.com).
+Analysis completed in: 40.928 seconds using [knitr](https://cran.r-project.org/package=knitr) in [RStudio](http://www.rstudio.com).
 
 # References