Added support for pythonbrew, pythonz, and rbenv.
Fixed merge collisions.