Merge branch 'master' into 1623-local

Conflicts:
	lib/linguist/heuristics.rb
Merge branch '1623-local' of github.com:github/linguist into 1623-local

Conflicts:
	lib/linguist/heuristics.rb