badges for travisci and coveralls
mergin
Merge branch 'master' into stock_data

merge