Added iTerm 2 keymap settings
Reorganized