Update evict to latest rust master
A few more updates to bring us up to latest master.  Looks like things are working properly.  Tests may be broken.