Improved readability.
Fix Grunt watch rules.
Added grunt-contrib-clean to wipe the dist folder.