Merge pull request #92 from greboid/tidying

Tidying
Switch to SwingEventBus