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.
Ahh..found it. It was in Eclipse. There are multiple file associations in Eclipse and even thought a 'text editor' may have the setting of 2 tab width, with Java files the setting is buried in a setting deep in the Java customization. What a pain.