Update for Python 2.6 and bonding options