merged gruntfile with martin's and aysegul