Misc merge

Github needs a good merge tool