adding travis
Merge branch 'master' into kaldi-patch