misc bits and pieces
Merge pull request #215 from ParagonDevelopmentTeam/more_bits

misc bits and pieces
little fixes for ship defs
Merge pull request #216 from ParagonDevelopmentTeam/extra_bits

little fixes for ship defs
Merge remote-tracking branch 'origin/master' into asteroids