Cleaning up
Merge branch 'master' of https://github.com/hepplerj/dotfiles
Restructuring some vimrc stuff, new zsh configurations