Merge branch 'groceryheist'

paper_template/Makefile

@@ -22,8 +22,7 @@ clean:
 viewpdf: all
 	evince *.pdf
 
-vc:
-	resources/vc-git
+vc:	resources/vc-git
 
 pdf: all
 

paper_template/text.tex

@@ -9,7 +9,7 @@
 \pagestyle{mako-mem}
 
 \usepackage[utf8]{inputenc}
-
+\usepackage{wrapfig}
 \usepackage[T1]{fontenc}
 \usepackage{textcomp}
 \usepackage[garamond]{mathdesign}
@@ -80,8 +80,8 @@
 \baselineskip 16pt
 
 \title{Title}
-\author{Benjamin Mako Hill\\
-        \href{mailto:makohill@uw.edu}{makohill@uw.edu}}
+\author{Nathan TeBlunthuis\\
+        \href{mailto:nathante@uw.edu}{nathante@uw.edu}}
 \date{}
 
 \published{\textsc{\textcolor{BrickRed}{This document is an
@@ -184,6 +184,7 @@ lazy dog.  The quick brown fox jumps over the lazy dog.  The quick brown
 fox jumps over the lazy dog \citep{989866}.
 
 % bibliography here
+\setcounter{biburlnumpenalty}{9001}
 \printbibliography[title = {References}, heading=secbib]