UPDATED: minor changes to conf.py and changelog
merge