Merge master into #417

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