more intellij keymappings
Merge branch 'master' of github.com:mdodsworth/dotfiles
more intellij keymapping changes