Merged recent updates to oboformat code

Squash of three commits on oboformat by Heiko Dietze
Merge remote-tracking branch 'upstream/master'