Deleting file (accidentally added in a recent merge).
Fixing merge with devel branch.
Merge pull request #86 from jwj61/devel

Devel
removing local config that I screwed up
added apache-config to ignore list
Trying to get Setmaker.pm working again after merge.