Some cleanups . added certificates.y
Merge branch 'master' of https://github.com/zferentz/maproxy

Conflicts:
	maproxy.py