Preliminary merge of winbind into HEAD. Note that this compiles and links