Enable type=None
(#305)
Some bug fixes for the new lensing stuff to work with config files
(#305)
Make sure psf gets automatic flux=1
(#305)