Merge pull request #51 from joshbeitler/feature/code-cleanup

Massive code formatting cleanup
Merge pull request #63 from joshbeitler/master

Develop