Merge branch 'release/0.7.0' into develop
Use scalariform
Merge pull request #54 from twitter/jco/scalariform

Use scalariform
Merge branch 'develop' of github.com:twitter/tormenta into kgonina/storm_spout_metric_aitools-699

Conflicts:
	tormenta-core/src/main/scala/com/twitter/tormenta/spout/BaseSpout.scala
	tormenta-core/src/main/scala/com/twitter/tormenta/spout/SchemeSpout.scala