Merge branch 'master' of github.com:/auntieNeo/nixrc

Conflicts:
	configuration.nix