Tidied up gruntfile and updated config