first passing run
with bootstrap config
cleaning up apache test install
Adding readme
Adding readme corrections
Updating readme and removing debugging'
added extra parameter for adjusting security settings
Readme updates
cleaning out apache and canary site
Moving puppet files to puppet folder
Merge branch 'master' of github.com:seocam/django-ldap-idp

Conflicts:
	.gitignore