added initial SQL layout
Merge branch 'master' of https://github.com/nmesstorff/adamjlow-proftpd
Fix puppet-lint

Conflicts:
	manifests/config.pp