Remove commented-out code
Merge branch 'master' of https://github.com/sdao/TessendorfOceanMax.git