Update travis.yml to look in ci/
Moved requirements to a sub dir
Merge remote-tracking branch 'upstream/master'
Merge pull request #120 from tfhartmann/master

Moved requirements.txt to a subdir