Rename test reg040 to avoid clash
Rename test in idris.cabal too...
Merge branch 'master' of github.com:idris-lang/Idris-dev