Added a number of things.
Merge branch 'master' of github.com:auntieNeo/nixrc

Conflicts:
	configuration.nix