Updates 2014-01-06

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