Merge with fs cleanup from @stanistan
Merge branch 'feature/plugins-v2' of github.com:Factual/drake into feature/plugins-v2