Do not test old hg versions with new python
Add hg 2.5 to travis tests
Test what happens when a file is removed or replace by a dir

Right now, replacing a file by a dir causes an xfail, see
issue #36.