Rename travis file to .travis.yml
Merge remote-tracking branch 'origin/step1' into step1