Matching generator-red-static grunt config loading options
Merge branch 'feature/update' into develop

* feature/update:
  Matching generator-red-static grunt config loading options
  Adding update task for upgrading grunt and npm tasks.
Merge branch 'develop' of github.com:ff0000/generator-red-django into develop

* 'develop' of github.com:ff0000/generator-red-django: