Camelize some snake_case variable names
Merge remote-tracking branch 'titanous/camelize'