See, that wasn't too bad
Merge pull request #158 from joshbeitler/source-cleanup

See, that wasn't too bad