Tidy some stuff, fix a test, and add .gitignore for eclipse