Upgrade express.
Add back dist directory.
Fix `grunt clean` task, closes GH-22
Merge branch 'master' into feature-cache-ng-templates