remove old ssh complete. install homebrew base-completion. remove old git alias (breaks completion). set git to no-edit for merge.