Fix build on mac.
add hamcrest matchers, part of junit
Merge pull request #11 from nitay/mac-fix

Fix build on mac.
Switch to using Java 7, and clean up the compiler warnings around
JComboBox that result from the switch.