indentation fixes
version bump
Merge pull request #157 from ryanpcmcquen/master

more indentation consistency