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
Bump travis-build.

Includes latest updates to the Coverity addon.
Bump travis-build.

Includes a fix for coverity addon.
Merge branch master, bump travis-build.

Conflicts:
	Gemfile.lock
Bump travis-build.

Includes a better fix for PS4.
always fetch the template list
Merge branch 'master' into features/always_fetch_template_list
Use jruby 1.7.10
Bump travis-build

Includes fixes for sauce addon, go paths and travis_wait.
Merge branch 'master' into bluebox-production-com

Conflicts:
	Gemfile.lock