Add a lot of stuff
Merge branch 'master' of https://github.com/patrickcorrigan/configuration_files
added things to vimrc