Merge branch 'master' of git://github.com/lkiesow/pyCA

Conflicts:
	pyca.py
	pyca/ca.py
	pyca/config.py
	pyca/ui.py
	readme.rst