Changes
Better virtualenv handling