Add local or shuffle option
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