Conky updates for Minion. Added disk use command so maybe I can stop forgetting it.
Cleaned up duplicate stuff in Vimrc files.
Merge branch 'master' of github.com:edthedev/dotfiles