Add requirements.txt for virtualenv
Merge remote-tracking branch 'origin/master'