Deployment script now includes grunt
Merge branch 'master' of github.com:kisonecat/ximera