Merge pull request #4 from yahoo/master

merge changes from yahoo/storm-yarn
Undo a merge error in previous pull request
Merge pull request #6 from anfeng/master

Undo a merge mistake in pull req #5