Various style fixes, fix ruby 1.8 compat
Rename with underscores
Fix 1.8 support
Merge branch 'untangle-rename-ms12-020'

Technically, landing my own PR #1429, but it's really just a fixed up
version of #1427