Merge all of our branches with master