Squash of early work on imaging
Merge branch 'master' of github.com:JackMc/CPlasmas