Add grunt to dev vm, update submodule.
Merge master into demo.