Travis is awesome
Merge branch 'lint_fix'