VVWM - All SimType's now work (needs to be updated for EC2 still)
Merge branch 'jon' into sprint11

Conflicts:
	app.yaml
therpshistory
merge
Merge branch 'tao' into sprint11