Merge remote-tracking branch 'forkorigin/master' into detect-nemerle-language

Conflicts:
	lib/linguist/mimes.yml
	test/test_blob.rb

lib/linguist/languages.yml

@@ -495,6 +495,7 @@ Markdown:
   - .ron
 
 Matlab:
+  type: programming
   extensions:
   - .m
   - .matlab

lib/linguist/mimes.yml

@@ -55,3 +55,4 @@ text/plain @cu,cxx
 text/x-nimrod @nim
 text/x-ocaml @ml,mli,mll,mly,sig,sml
 text/x-nemerle @n
+text/x-scheme @rkt,scm,sls,sps,ss

test/test_blob.rb

@@ -293,8 +293,11 @@ class TestBlob < Test::Unit::TestCase
     # https://github.com/googleapi/googleapi/blob/master/demos/gmail_demo/gmail.dpr
     assert_equal Language['Delphi'], blob("program.dpr").language
 
-    # https://github.com/philiplaureano/Nemerle.FizzBuzz/blame/master/FizzBuzz/FizzBuzzer.n
+    # https://github.com/philiplaureano/Nemerle.FizzBuzz/blob/master/FizzBuzz/FizzBuzzer.n
     assert_equal Language['Nemerle'], blob("hello.n").language
+
+        # https://github.com/dharmatech/agave/blob/master/demos/asteroids.sps
+    assert_equal Language['Scheme'], blob("asteroids.sps").language
   end
 
   def test_lexer

test/test_mime.rb

@@ -173,6 +173,7 @@ class TestMime < Test::Unit::TestCase
     assert Mime.text?('.sh')
     assert Mime.text?('.sig')
     assert Mime.text?('.sml')
+    assert Mime.text?('.sps')
     assert Mime.text?('.src')
     assert Mime.text?('.tcl')
     assert Mime.text?('.texi')