Some tweaksin preparation for diffraction paper.
Merge branch 'master' of github.com:jcandy/jaam