Merge pull request #5 from jeffreymyers/master

Fix import from Java 7's Objects to Guava's (for Java 6 compatibility)
Minor change to test auto-building pull requests