fix ssh autocompletion
added to macsetup.sh
fix typo in tmux.conf
Merge branch 'master' of github.com:edwelker/nix_conf
/usr/bin/vim editor to ignore those git 'problem with the editor 'vi'' errors