Added comp_root() and ws_root() functions, tidied up some error handling.
Merge branch 'master' of github.com:nljelfs/dotfiles