improved gruntfile
Various updates, still very rough