Adjusted filepaths to pev-shared instead of my personal pevi
Adjusted my base.path to minimize differences between the 2
Merge branch 'master' of github.com:serc/pevi

Conflicts:
	R/run-experiment.R
Made no chnages but git is telling me to merge branches
trying to commit so I pull files
Not sure what has changed, but I will pull and start fresh
Merge branch 'master' of github.com:serc/pevi
Merge branch 'master' of github.com:serc/pevi
Merge branch 'master' of github.com:serc/pevi
Updating for google Earth files
Merge branch 'master' of github.com:serc/pevi
Merge branch 'master' of github.com:serc/pevi
Modified code to make icons and labels invisible for charger-free TAZs
Icons and labels no longer appear for TAZs with no chargers
fixed bug that made TAZs with no chargers appear
Modified code so that TAZs with no chargers do not appear in Google Earth

Merge branch 'master' of github.com:serc/pevi