dont show salvage window if scrappy is loaded

fixes issue #12
fix whitespace to match the rest of the project
change to OTBS
Merge pull request #19 from midraal/origin/patch-1

dont show salvage window if scrappy is loaded
Ported to new Salvage Window based on Carbine diffs.
Merge pull request #20 from Therzok/newSalvage

Ported to new Salvage Window based on Carbine diffs.
Merge pull request #21 from vikinghug/test-180

Test 180