Nuke dist temporarily, remove chmod tasks.
Merge, Gruntfile.js conflict resolved.