Clenaup gruntfile
Use newer gruntfile
Cleanup manually after merge

A lot of upstream changes must be merged with the diazo generator
Update path transform
Commit minimized favicon