various improvements
Merge branch 'master' of https://github.com/MikeWilkie/EPEL-LEPP-Configuration

Conflicts:
	README.md
	conf/etc/nginx/ssl.d/ssl.conf