update some git aliases
more aliases!
stop conflict with osx switch-window shortcut
linter settings