Merge pull request #101 from csmith/master

Use TabCompleterUtils instance.
Add getOptionalConnection
Tidy up.
Merge pull request #102 from greboid/optional-connection

Add getOptionalConnection
Fix build.