updating several files, including mysql-python==1.2.5
add MarkupSafe and six
Merge remote-tracking branch 'origin/mysql-python-1-2-5'