issue #2 updated determine pick order based on new criteria

fixed bug in determine_pick_order() and determine_initiative_order()
where higher trauma won ties!
some whitespace tidying
Merge branch 'master' of https://github.com/dgolbourn/Opportunity-Role-play-System