Updates 2013-07-20

    conduit

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