Merge remote-tracking branch 'mhrivnak/travis' into yubikey-travis