minor changes
Merge branch 'master' of https://github.com/0mark/minirc

Conflicts:
	rc