Renamed travis.yml to proper filename and travis changes
Merge pull request #26 from simi/master

Travis