Improve formatting & whitespace

Convert to 4-space indent; couchbase-java-client coding style.
Merge pull request #2 from daverigby/master

Improve formatting & whitespace