Merge pull request #8 from nathanmarz/master

merge changes from nathanmarz/storm master
enable supervisor port to be configurable
Merge branch 'messaging' of github.com:anfeng/storm into messaging
Merge branch 'master' of git://github.com/nathanmarz/storm into messaging
Merge pull request #550 from anfeng/messaging

Enable supervisor port to be set in test