Fixed formating errors
Added indications of when the virtualenv is activated
Fixed merge issues