some other changes
etc
Removed test class
Merge branch 'master' of https://github.com/teo-mateo/isidore.git

Conflicts:
	src/com/tbardici/isidore/IsidoreSettings.java