Upgrade to support docker 0.6.5 and v1.6 API