Clean Imports: Fix #441 by formatting imports one per line, with indentation.
Fix wildcard member imports (e.g. import java.util{Collections{ singletonSet=singleton, ...}}) since we were dropping the wildcard before.
Merge pull request #543 from tombentley/clean-imports

Clean imports