Merge branch 'master' of github.com:kaelzhang/cortex
#248: add deps on fs-expand