remove redundant arguments
alpha-renaming etc
Merge branch 'master' of github.com:slindley/dependent-haskell

Conflicts:
	Box/Box.hs
	Box/Cursor.hs