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, to be truthful, I know the test needs a bit of work, but I wanted to get the PR in as it's been outstanding awhile. I can hold off and resubmit.