rebasing #1184 onto the Nov 2014 version

since #1184 wasn't merged and rebasing was too much work I recreated the patch.
@sebgod if it's not checked in then it won't show up in the stats on GitHub. Alternatively if they're already checked in then you can use the overrides to set `linguist-language=vendored`: https://github.com/github/linguist#overrides