Squeezy squeeze.
Merge branch 'master' of https://github.com/mgrosvenor/camio2

Conflicts:
	papers/apsys_demo/camio.bib
	papers/apsys_demo/paper.tex