Bring up to date with Python >2.5 and google syntax style.