Merge my personal fork back into the main project.

This should be pretty minor updates.  I want to start using the main ONA project instead of my own.. making sure everything is in sync.