Tweak travis and codesniffer configs
Fix some issues found by codesniffer