Auto-select after adding 2nd item to crafting annex
Deequipping causes weapon cycling to start with the last eqipped weapon
Merge pull request #1808 from bucketh3ad/craft_selection

Address some minor quibbles regarding crafting and weapon selection