slight cleanup
Merge branch 'dev' of https://github.com/agnwinds/python into ion_modes