Formatting, switched to Java7.
Merge pull request #1 from rjeschke/java7

Switched to Java7.