Be more consistent about style and copyright headers.
Merge pull request #76 from square/jwilson_1118_upstream_javawriter_tweaks

Be more consistent about style and copyright headers.