Disable p4 for vcs_info -- it takes for friggin ever
Clear out accidentally added local settings in env.local

Conflicts:

	env.local