Updated to newer version of Erbium from upstream Contiki