Merge branch 'master' of github.com:carsongross/oppfinder

Conflicts:
	src/main/gosu/datagen/assets/Companies.txt
	src/main/gosu/datagen/assets/data.json
	src/main/gosu/util/MahoutUtil.gs
Merge branch 'master' of github.com:carsongross/oppfinder
Getting tests to work
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/gosu/datagen/GenerateRandom.gs
	src/main/gosu/datagen/assets/data.json