updated gruntfile and packages
merge in changes