index file updated
removing config files from repo
removing config files
Merge branch 'master' of github.com:tharris/wormbook

Conflicts:
	conf/httpd.conf.dev
	conf/perl.startup