FreeMarker Scala/Java tests working, getting ready to fully integrate
Merge branch 'master' of github.com:alvinj/CatoGui

I have no friggin' idea why this merge is necessary. (I'm fighting with Git atm.)