Reworked message-foward as per pull request suggestions

Reworked message-forward as per pul request suggestions. Added *.swp file to .gitignore. Replaces bad PR from before that for some reason included multiple commits.
This test should really be in EventBusTestBase, so it's tested both local and clustered.