More consistent dict for APIOptions and neighbor-changes messages are now created.
Merge pull request #148 from wmiltenburg/master

More consistent APIOptions dict