Fix stupid typos
begin working on a mixed proposal sampler
remove depricated headers
Oops, I've gotten too used to working on one machine and didn't pull my latest windows changes.
expose new sampler
Finish implementing mixed sampler
Merge branch 'windows-support'