now at minimal change
image: dup key in relevancy block
Merge pull request #487 from duckduckgo/russell/bttf-images-dup

image: dup key in relevancy block
back out zip
Merge pull request #486 from duckduckgo/russell/bttf4cast

Russell/bttf4cast — fix some city relevancy
dedup for videos
Merge pull request #488 from duckduckgo/brian/bttf-dedup-videos

dedup for videos
Merge branch 'bttf' of github.com:duckduckgo/zeroclickinfo-spice into bttf
dictionary: re-enabled sound manager
Merge branch 'bttf' into russell/bttf-basic-changes

Conflicts:
	.travis.yml
naming changes
templates. Breaks some, but needs to be done
template_options substitutions
some DDG helper functions renamed
Merge pull request #491 from duckduckgo/russell/bttf-helpers

some DDG helper functions renamed WIP
ddg helper function name changes
octopart - temp
products template test
Added additional information to ruby_gems Spice.
DDG::Spice::Maps::Places: add restaurant(s) trigger.