Merge AntiGrav Generator & Ship 

plus some markup, and clarification of WolfToy tag