Fixing some of my bad git management