Swap Armor and Horn genes

Move Armor to Horn's position on Chromo 1.
Move Horns to top of Chromo 2 and push everything else down.