switch to current nix setup from tpv
Merge branch 'master' into individual_aspects
Attribute mapping for ldap added to aspects