Fix Travis formatting, tweak Github formatting