Undo previous change until I work out why it was important...
Merge branch 'master' of github.com:edwinb/Idris-dev