WIP FIX: Fix Travis

Travis is being lax about style, need to tighten things up. Do not merge.