Added E3HD as Boxtype
spaces 2 tab... (stupid vim)
Merge remote-tracking branch 'hdf/master'

Conflicts:
	data/rc_models/Makefile.am