Remove term from vimrc, tweak golang things in zshrc