Local refactoring before pull down of changes from work
Merge branch 'local/SSH-Tunnel-Refactor' into merges/home_refactor_into_work_refactor
Cleaned up code to make work after merge

Conflicts:
	server.js
	webserver.js
Merge branch 'merges/home_refactor_into_work_refactor'