Allow bono to be optional
Updates after review
Merge pull request #88 from Metaswitch/optional_bono

[Reviewer: Alex] Allow bono to be optional