Merge branch 'master' of git://projects.mako.cc:/latex_mako into groceryheist

diff --combined paper_template/text.tex
index c3927cbb49b7f4a1fd1330ae8c311117a47abe55,a59dfbd2919c9ffb135c6bfcf10813fed402f77b..ae03561be317a4a694b5a50f5b5bd145bb31cabb
--- 1/paper_template/text.tex
--- 2/paper_template/text.tex
+++ b/paper_template/text.tex
@@@ -8,8 -8,7 +8,7 @@@
  % with article-3 \chapterstyle, change to: \pagestyle{memo}
  \pagestyle{mako-mem}
  
- \usepackage{ucs}
- \usepackage[utf8x]{inputenc}
+ \usepackage[utf8]{inputenc}
  
  \usepackage[T1]{fontenc}
  \usepackage{textcomp}
@@@ -34,7 -33,19 +33,19 @@@
      urlcolor=Blue, unicode=true}
  
  % add bibliographic stuff 
- \usepackage[round]{natbib}
+ % add bibliographic stuff 
+ \usepackage[american]{babel}
+ \usepackage{csquotes}
+ \usepackage[natbib=true, style=apa, backend=biber]{biblatex}
+ \addbibresource{refs.bib}
+ \DeclareLanguageMapping{american}{american-apa}
+ 
+ \defbibheading{secbib}[\bibname]{%
+   \section*{#1}%
+   \markboth{#1}{#1}%
+   \baselineskip 14.2pt%
+   \prebibhook}
+ 
  \def\citepos#1{\citeauthor{#1}'s (\citeyear{#1})}
  \def\citespos#1{\citeauthor{#1}' (\citeyear{#1})}
  
@@@ -58,8 -69,8 +69,8 @@@
  \baselineskip 16pt
  
  \title{Title}
 -\author{Benjamin Mako Hill\\
 -        \href{mailto:makohill@uw.edu}{makohill@uw.edu}}
 +\author{Nathan TeGrotenhuis\\
 +        \href{mailto:nathante@uw.edu}{nathante@uw.edu}}
  \date{}
  
  \published{\textsc{\textcolor{BrickRed}{This document is an
@@@ -162,10 -173,8 +173,8 @@@ lazy dog.  The quick brown fox jumps ov
  fox jumps over the lazy dog \citep{989866}.
  
  % bibliography here
- \renewcommand{\bibsection}{\section{\bibname}\prebibhook}
- \baselineskip 14.2pt
- \bibliography{refs-processed}
- \bibliographystyle{apalike}
+ \printbibliography[title = {References}, heading=secbib]
+ 
  
  \end{document}