Updated license
changes to fix assertRaises on python 2.6