Merge secondary setup.

Added green backgrounds to files from upstream merge yesterday. Also
removed README.md from my repo.