Indentation and commenting
Merge branch 'devel' of https://github.com/literat/nix-sources into devel