updated bib and Rmd
merged bib

Merge branch 'master' of https://github.com/jhollist/hkm2014

Conflicts:
	hkm2014.bib