Remove VIRTUALENV references from Makefile
Remove/expand simple vars that are not changed