Separate booking generation andpayment
Merge branch 'master' of https://github.com/kevstessens/vontrip