update gruntfile, better assets
Merge branch 'master' of github.com:CartoDB/docs
fix deploy