short fix  in jekyll config and better grunt task config
Merge remote-tracking branch 'github/master'

Conflicts:
	Gruntfile.js