Added travis config
Merge branch 'master' into fix-ruby1.8