tweaks
Merge branch 'master' of github.com:psychobunny/node-forum
changing the way the express app is instantiated
Merge branch 'master' of github.com:psychobunny/node-forum

Conflicts:
	public/templates/header.tpl
Merge branch 'master' of github.com:psychobunny/node-forum
changing socket.io to exist on the same port as the server, made config file template (removed config file from repo)