Make sure pip output is handled correctly
Merge branch 'feature/vagrant' into develop