Minor cleanup
Merge pull request #199 from twitter/storm-summer

Minor cleanup
Merge branch 'develop' into feature/acking_option

Conflicts:
	summingbird-storm/src/main/scala/com/twitter/summingbird/storm/StormPlatform.scala