Modify ruleset
Fix outstanding rules
Merge pull request #4929 from wilsonge/rulset

More travis code style checks