TASK-16: refactor adding click listeners to select vehicle buttons
TASK-8: ensure we don't connect to ourselves

- MISC: minor clean up
Merge pull request #22 from nathanmyles/TASK-8

Task 8 / Task 16