Added a bib and made more additions to the paper
Merge origin/master