#9 - fix up naming to pacify pep8-naming
Merge pull request #10 from blairconrad/cleanup-naming

#9 - fix up naming to pacify pep8-naming