travis.yml: reindent and rearrange blocks in the file
travis.yml: reindent and rearrange blocks in the file

Signed-off-by: Giuseppe Scrivano <20002b7b24c75512093a71a58285826d5c504fca@redhat.com>

masters-of-cats/image,containers/image,containers/image