Merge pull request #1157 from toopay/travis

Travis setup