Storm 511 (minor changes)

I made a few small changes to what you did for STORM-511. But everything seems to test out okay.

This pull request contains a lot of additional commits that are unrelated to storm-kafka. That's likely because your repo may not be up to date with the apache master branch. They should go away if you update.

Thanks for the contribution!

-Taylor