htaccess gruntfile
merge