Update Express.
Unbreak the /rss content-type.

Not sure how that happened.
Merge branch 'master' into h4md1_openshift

* master:
  Unbreak the /rss content-type.
  Update Express.

Conflicts:
	package.json