Updated with Mac OS X 10.5+ keybindings
Merge remote-tracking branch 'origin/master'