Change from bootstrap.typeahead to twitter.typeahead
Merging conflicts