Accomodate Yi package split
ghc-mod 5.0.1.1
Add 7z
32-bit builder
yi expr updates
shell.nix for rtorrent-state
Override locations to be for my machine
Merge remote-tracking branch 'root/master'

Conflicts:
	nixpkgs-config/config.nix