misc changes
Merge branch 'nix' of github.com:altphi/shellconf into nix