Handle Java 1.6 vs 1.7 automatically
Better readme, update for SDK 17