Changing config loading to be less stupid.
Merge branch 'master' into add-post-list

Conflicts:
	server.js