Resolving conflicts and merging recent changes to bng.py into 'lharris'
branch