Encoding issues
Merge branch 'master' of github.com:jjfiv/GalagoTools

Conflicts:
	src/main/java/edu/umass/ciir/galagotools/utils/IO.java