Extract generic dfs
Merge branch 'master' into bundle-map-reducers

Conflicts:
	lib/sprockets/bundle.rb