Updates to use Java 7

Reviewed in https://codereview.appspot.com/11456043/
Merge pull request #3 from danholevoet/master

Updates to use Java 7