Add options tests
add another test
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
Merge pull request #335 from twitter/options-test

Add options tests