add in redcloth, clean up files to align with master