respect vendor/assets as well as app/assets

Conflicts:
	lib/requirejs_optimizer/railtie.rb