Sync code up with github for cloning on dumuzi