rearrange stuff, rename subst-lemma
Merge branch 'master' of github.com:benhuds/Agda

Merge branch