Default resolution units should be pixels (not angstroms)
Merge branch 'testing' of github.com:antonbarty/cheetah into testing