Ignore .py~ for git and vim.
Merge branch 'master' of github.com:nwoodbury/dotfiles
Fixed NERDTree ignoring .gitignore.