Improve Java style
 * Use List rather than ArrayList
 * Close resources in a finally block
 * Use for-each rather than iterators
 * Use a Reader directly rather than InputStream+InputStreamReader
Go back to using single class imports, accidentally replaced by .* in the previous commit
Fix indentation
Merge pull request #1 from guycoleman/develop

Improve Java style in sample import client