Rework deps to point to 2.1 release and not dev master