QOL readability improvements; progress on Radar canvas
resolution of merge conflicts
hotfix to gruntfile.js