Get tests working, delete Linux ~ files

Try to get tests working for Travis, delete ~ files put by Linux, which
I think are diff files.