Use grunt-cli instead of grunt.  Clean up formatting