Cleaned up bashrc
Removed qvars since it's use on almost no machines
Merge branch 'master' of https://github.com/NickCody/dotfiles