Add travis support fix some small coding standards issues.
Refactored copy paste code to appease travis.
Fixed coder warning.
Merge pull request #1 from nigelgbanks/7.x-travis-support

Add travis support fix some small coding standards issues.