Numerous style changes.
Merge pull request #18 from BenOvermyer/dev

Numerous style changes.