Massively overhaul cmd-key-happy configs, and some iterm2 updates.