Changes to Gruntfile, moved server, ...