Updates to dotfiles

Mostly added for git gutter
Fixing key bindings for switching windows
Merge remote-tracking branch 'origin/master'