Initial config
Merge branch 'master' of github.com:neildunbar/slapd

Conflicts:
	.gitignore
	README.md