Add requirements.txt for virtualenv
fix merge