python click-2.1
python plumbum-1.4.2
python pip-1.5.6
Merge remote-tracking branch 'upstream/master'