cleanup, changed citation order style.
Merge remote-tracking branch 'origin/master'

Conflicts:
	doc/latex/bib.bib
	doc/latex/hive_simulation.bcf
	doc/latex/hive_simulation.blg
	doc/latex/hive_simulation.out.orig
	doc/latex/model_description.tex.orig