Bump travis-build.

Includes a fix for the fix for patching in a local hostname.
Bump travis-build.

This reverts a commit that tried to be nicer to addons as lists.
Bump travis-build.

Includes coverity scan addon.
Bump travis-build.

Includes revamp of coverity_scan plugin.
Bump travis-build. Include minor fix for coverity integration.
Bump travis-build.

Includes a minor change for the Coverity addon.
Merge branch 'features/duplicate_and_template_handling' into staging

Conflicts:
	Gemfile.lock
Merge branch 'features/duplicate_and_template_handling' into staging
Merge branch master, bump travis-build.

Conflicts:
	Gemfile.lock
Bump travis-build.

Includes a better fix for PS4.