Backport matches_filter
Merge branch 'master' into linked-assets

Conflicts:
	lib/sprockets/base.rb
Link asset to environment
Track bundle requires on included