Rename away from storm specific naming
Dependency instead of dependant
Merge pull request #384 from twitter/feature/add_local_or_shuffle_option

Add local or shuffle option
Merge branch 'develop' of github.com:twitter/summingbird into feature/generalize_storm_code

Conflicts:
	summingbird-storm/src/main/scala/com/twitter/summingbird/storm/Constants.scala
Fix a little WS