Merge commits that got left behind(?)

Add some commits that github thinks got left.  Also test if GitHub bot is moved properly.