Gruntfile and indexes adjustments