Gruntfile and solution changes