removing reference to a font that I cannot seem to install
Merge remote-tracking branch 'tim/master'

Conflicts:
	paper.latex.template
Merge remote-tracking branches 'tim/master' and 'origin/master'
Daniel's edits to the latest version; the boxes have not been tackled yet
adding Daniel to the readme :)
Merge pull request #6 from stouffer/master

Daniel's edits