env HOST & PORT added
Merge remote-tracking branch 'origin/yogi' into yogi

Conflicts:
	bin/www