Added missing configurations from before internship.
Merge branch 'workstation' of github.com:fedeDev/dotfiles into workstation

Conflicts:
	vim/vimrc
tmux
mutt aliases
merged oh-my-zsh upstream