rws meetup changes
Merge branch 'master' of https://github.com/russellwstanley/singaporescala

Conflicts:
	ocr/src/main/scala/OcrReader.scala
cleaned up. all tests passing