first pass at avoiding JS conflicts
ignore generated JS dir
add missing file
whoops, delete unintentional file, correct Grunt task
Merge branch 'merge-conflict-avoidance'