fp (full pull) -> rp (ruby pull)
typofix
icdiff
readme for icdiff option
Resolved merge conflicts