add gitignore
Fixed up test configuration.  Changed local.conf to test.conf.  Running
test will use test.conf.
remove dsstore
Merge branch 'testconfigfix'

Conflicts:
	.gitignore