underscores instead of camelcase for consistency
Merge pull request #273 from humanmade/varname

underscores instead of camelcase for consistency
Merge branch 'master' into dev