Fix typo that led to unification bug

(As caught by the whitespace implementation, which is definitely pulling
its weight ;))
Re-rename FunN all the way back to Fun.
Merge branch 'master' of github.com:edwinb/Idris-dev