adding travis support
Merge branch 'master' into rack_test_upload_file