gitconfig pulled by personal
restored gitconfig
Merge branch 'master' of github.com:nbirnel/dotfiles
add mailcap
Merge branch 'master' of github.com:nbirnel/dotfiles