* resolved conflict
* Docs updated re: Anaconda/certifi issue re #7373
* Removed --console-log "not working" note
* A note about Anaconda virtualenvs
* Make anaconda comment fit on page
* Added README to docker directory
* Added install doc reference to master copy of contrib/docker/README.md
* merged master, removed mysqlclient
* Removed mysql dependency, Anaconda and --console-log references
* Add cypress install command to cypress test instructions
* Fixed cypress instructions re: port 8081
* Removed anaconda reference, runserver references
* Remove anaconda reference
* Added back a self-contained version of mysqlclient to dev requirements
* Added ASF license to docker README.md
