Scala 2.11 and JDK7 support

This updates jcaptcha to a version that works in JDK7, and modifies other code to work with newer versions of Scala.

May want to cherry-pick commits and do just one or the other first.