Change variable naming to snake_case
Merge pull request #35 from jensv/2013-08-uwmadison

Change variable naming to snake_case