Updated gruntfile, more stylistic changes