updated plugin description
Merge remote-tracking branch 'upstream/master'

Conflicts:
	AssetPipelineGrailsPlugin.groovy