Adding gitconfig
Removing exclusion to nonexistent file in .gitignore
Merge branch 'master' of github:DanThomson/dotfiles
Merging in remote changes
Adding set nowrap to vimrc