Change vim colorscheme
Add Go syntax for vim
Change psql alias in zsh
Fix merging conflict

Conflicts:
	vim/vimrc.symlink