Fix replace:dist task
Merge remote-tracking branch 'origin/master'
Icons now hex escaped to prevent occasional conversion glitches
Code formatting and changes to jshint task