Bug fixes

Fixes:
- Issue #971 in new Vehicle Setup code
- Setup action was getting confused with Preferences action by automatic QT OS X automatic menu munging stufff. Set correct roles so this works correctly.

Also removed an unused action.