Java7 upgrade and syntax cleanup.

Fixes #53.  Syntax conversion to Java7.  Used diamond brackets, collapsed exceptions and use of string switch statements.  Also cleaned up language level warnings.