master: better gruntfile
merged