test commit
remove test file
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
edit ratpoison chapter up to ratpoisonrc section
corrected spacing after italic in Ratpoison chapter, fixed bad link
mini-commit
Merge remote-tracking branch 'mimosa/master' into mimosa

Conflicts:
	guide.t2t