I don't like using vi
Merge branch 'master' of https://github.com/elephantscale/ctl

Conflicts:
	README.md
I don't like vi