Use filename
Encoding is always defined now that 1.9 is required
Merge branch 'master' into non-template-processors

Conflicts:
	lib/sprockets/context.rb