Merge pull request #368 from janorn/travis

Change travis to exclude unwanted branches