Added travis support
Merge remote-tracking branch 'rohe/master'
Adapted Travis config to use tox