updating mysql-python to 1.2.5 and several others

@camd this merges what was in branch `mysql-python-1-2-5` @ 48198d6 to master.