Merge branch 'develop' into 1286412-Basement

Conflicts:
	src/EnergyPlus/DataGlobals.cc
Merge branch '1286412-Basement' of github.com:NREL/EnergyPlusTeam into 1286412-Basement
First pass at adding output reporting the total number of cells to the eio file.