A fix for #224 that includes JVET-M0281 and JVET-M0117 in IBC AMVP And some small code cleaning (in particular typos crashing the compilation with IBC==0 macro)