Updated vimrc.
Merge branch 'master' of github.com:seanochoa/dot-files
Update to various files.
Updated zshrc.