port for AWS
Merge branch 'master' of https://github.com/mandarl/node-rss-combine

Conflicts:
	server-parasite.js
Merge branch 'master' of https://github.com/mandarl/node-rss-combine

Conflicts:
	server-parasite.js
stable
stable
c9 merge