python-six: Update to 1.3.0
python-mrbob: fix it and update to 0.1a9
Merge branch 'mrbob_fix'

Conflicts:
	pkgs/top-level/python-packages.nix