Update demo and Gruntfile
chore(all): More cleanup