adding redis support
Merge branch 'master' of github.com:blacki/NSAify

Conflicts:
	web.js