Merging doc changes into master

[rjrudin]

This also includes all the Java files being reformatted, but those are only whitespace changes and cause no functional changes.

Version is still set to 1.3.0.