Merge branch 'config_docs' of github.com:dnephin/swagger-editor into dnephin-config_docs

Conflicts:
	README.md