Moving to using Yolodev:master

didn't want to lose my corelib work.  should be good to merge in.