updated vimrc and added gitignore
Merge branch 'master' of http://github.com/dpinkerton/config-files