Major re-write of dotfiles