github/linguist — pull request #1442 by bkeepers (2014-08-05 17:21:22+00:00)
Title: Merge master into #417

#417 improves vendored file detecting & detect twitter bootstrap files. This just merges in master and fixes the merge conflict.