ecb was ruining my feng shui
Merge branch 'master' of github.com:stevejarvis/rcs

Conflicts:
	.emacs