General update
Merge branch 'master' of github.com:Phyrne/dotfiles
Removed troublesome files from cmus, added to gitignore