Redirect controller added (plus minor fixes)
Merge branch 'minimal' into swig

Conflicts:
	lib/controller/index.js