remove nvidia-xconfig, safer to just edit by hand
Merge branch 'master' of https://github.com/trev311/dotfiles