Update master branch

* Pin hashdiff version to support Ruby 1.8.7
* Update nori versin
* Reduce disk scanning whenever possible
* Add dvswitch pools