Add an await timeout
Merge branch 'develop' of github.com:twitter/summingbird into await-cleanup

Conflicts:
	summingbird-storm/src/main/scala/com/twitter/summingbird/storm/StormPlatform.scala
Merge pull request #380 from twitter/await-cleanup

Add an await timeout