Bumping java back to 1.6.

We went to 1.5 recently because we assumed that we weren't using 1.6 features anywhere, but that wasn't really true as the Override annotation was being used in a 1.6 way.
Merge remote-tracking branch 'origin/master'