Add qt config file.
Merge branch 'master' of github.com:reesmichael1/dotfiles
Do something (diff is useless, and I don't remember) to vimrc.
Fix merge conflicts.