Whitespace revert to non-windows carriage returns, formatting and Java 7 updates