Fix many formatting errors.
Merge pull request #27 from dstockwell/fix-formatting

Fix many formatting errors.