Wonderful...  git pull on ubuntu threw me a metric B load of merge conflicts...  so instead of compiling the wallet I get to figure this mess out instead.  Oh well time to hit the books.