Style tweaks.
Fix startup connection problem.
Merge branch 'CURATOR-33' of github.com:dragonsinth/curator into CURATOR-33