Update to latest branches

Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>