Update bashrc
Scale way, way down
Update vim configuration
Merge branch 'master' of https://github.com/telemachus/dotfiles