Mark asset tags as html safe if the method exists
Merge branch 'master' of github.com:petebrowne/sprockets-helpers

Conflicts:
	lib/sprockets/helpers.rb