Updates 2013-01-22

    cpphs
    highlighting-kate

Signed-off-by: Magnus Therning <magnus@therning.org>