Merge pull request #1289 from github/1132-local

1132 local
Reordering
Merge pull request #1290 from github/1258-local

1258 local
Samples
Merge branch 'master' into 997-local
Samples update
Merge pull request #1291 from github/997-local

997 local
Merge branch 'master' into 1261-local
Samples
Merge pull request #1292 from github/1261-local

1261 local
Merge branch 'master' into 1232-local

Conflicts:
	lib/linguist/samples.json
Explicit lexer
Merge pull request #1293 from github/1232-local

1232 local
Merge branch 'master' into 675-local

Conflicts:
	.gitignore
	lib/linguist/languages.yml
	lib/linguist/samples.json
Merge pull request #1294 from github/675-local

675 local
Merge branch 'master' into 820-local

Conflicts:
	lib/linguist/samples.json
Merge pull request #1295 from github/820-local

820 local
Add .pryrc support
Move .pryrc to filenames
Sort filenames