Looked at Jocelyn's changes and compared with previous revision, now ready to merge my changes
Now merged the changes through 01442157dd on the master branch...  After lunch I'll merge the rest.
Now I have merged all of the chnages from the 14 Feb release.  Ready to merge back to the master branch and check that all of the graphics are working properly.
Merged the branch, took major changes as necessary
Merge branch 'merge_state_a'

Conflicts:
	miniclean writeup.tex