change
Merge branch 'master' of https://github.com/elephantscale/ctl
good stuff

Conflicts:
	Ballantyne
Merge branch 'master' of https://github.com/elephantscale/ctl