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.
Yeah, I figured as much, I can make the change. I just really looked at the EventBustTestBase yesterday. I'll make the change.