A bunch more updates - mostly indentation - to match PyCharm's idea of proper code styling.
Merge pull request #5 from rivimey/feature/further-styling

A bunch more updates - mostly indentation - to match PyCharm