Add options tests
add another test
Merge branch 'release/0.2.5' into develop
Add serializers for BatchID, Timestamp
Add tests
Merge pull request #350 from twitter/serializers

Add serializers for BatchID, Timestamp
ADd a means to set defaults outside the planner
Merge pull request #351 from twitter/feature/add_default_option_setting

ADd a means to set defaults outside the planner
Adds a new local version tracking impl
Fix a bug in when to emit in storm
Add some logging around what we found on disk as the most recent version
Addressing review comments
Merge pull request #353 from twitter/feature/fix_bugs_hdfs

Feature/fix bugs hdfs
Add defaults as a last option for storm too
Merge branch 'develop' of github.com:twitter/summingbird into feature/add_storm_defaults
Update README.md
Merge pull request #356 from twitter/feature/add_default_option_setting

Feature/add default option setting
Merge branch 'develop' into options-test

Conflicts:
	summingbird-builder/src/main/scala/com/twitter/summingbird/scalding/ScaldingEnv.scala
Remove unused inner class
Update tests to specs2