Some codesniffer modifications.
Code review changes
Merge pull request #318 from jonathangreen/travis

Some codesniffer modifications.