change config file parameter name
adding config files
Update .travis.yml
Merge remote-tracking branch 'upstream/master'
adding new files