Lots of updates

Cleaned up code (with Arya at Boston Python Meetup) - Orbits mostly work
but there are a few outlier orbits that mess up.