Misc updates to bashrc, ws_usage script and vimrc
Merge branch 'master' of github.com:nljelfs/dotfiles