Merge branch 'John's-branch' of https://github.com/Technochrome/Tsunami-REU-2013-code- into John's-branch

Conflicts:
	toConstantTime.m
	trapModel.m
.savedTrapModel is huge, and I'm trying to remove it from the repo. I'm struggling at that.