Updated Gruntfile
Merge branch 'master' of github.com:cristiangrojas/grunt-django-compressor

Conflicts:
	Gruntfile.js