Very nice demo. I think the Terramancy / Aquamancy idea is very clever and unique.
As for controls, why not let the user change what buttons do what if he/she wants?
Also, maybe it's worth pointing out that you can hold down the jump button while running. That way as soon as you release it you'll have a decent sized jump ready.