fix travis syntax
Merge branch 'rmail-to-mail-remove-iconv-ruby-2-comp' into maildir-root