Merge pull request #8 from reidbaker/master

Continued integration
Merge pull request #9 from reidbaker/master

Just some formatting.