Fix config for local install
Merge branch 'master' of http://github.com/bentglasstube/simplewiki

Conflicts:
	config.yml
Merge branch 'master' of http://github.com/bentglasstube/simplewiki
Merge branch 'master' of http://github.com/bentglasstube/simplewiki