Merge branch 'traderRehab'
Merge branch 'slowmerchantmission'
Merge branch 'jumplua'
Merge branch 'master' of https://github.com/bobbens/naev
Slight rebalancing of missions so that few happen quickly to the player when they first start the game - includes some reduced chances and some moved away from Empire space