basic outline
Merge branch 'master' of https://github.com/mdsumner/rancid

Conflicts:
	README.md