Merge remote-tracking branch 'origin/build' into acceptance

Conflicts:
	metadata.rb
	recipes/rump.rb
Merge branch 'master' into acceptance

Conflicts:
	metadata.rb
	recipes/rump.rb
Fix up berksfile a bit.
TK tests are running though not passing yet.
Add ansicolor plugin for TK.
Some of our cookbooks have UTF8 in the metadata.
Correct deps and berksfile using released versions of everything.
Merge branch 'acceptance'

Conflicts:
	Berksfile.lock
	libraries/balanced_ci_pipeline.rb
	templates/default/job.xml.erb