First attempt
Fixed git-describe grunt task
Merge branch 'master' into describe
A little git-describe cleanup