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.
Here's an example of a test that uses await() and testComplete():
https://github.com/eclipse/vert.x/blob/master/vertx-core/src/test/java/io/vertx/test/core/LocalEventBusTest.java#L445
It should only take 30 seconds to correct the test, and I'd prefer not to have broken tests in the test suite.