Added travis and coveralls badges
Merge branch 'master' into test_restructure