Merge branch 'master' into fish

Conflicts:
	grammars.yml
	lib/linguist/languages.yml

grammars.yml

@@ -9,8 +9,6 @@ http://svn.textmate.org/trunk/Review/Bundles/Forth.tmbundle:
 - source.forth
 http://svn.textmate.org/trunk/Review/Bundles/Parrot.tmbundle:
 - source.parrot.pir
-http://svn.textmate.org/trunk/Review/Bundles/Ruby%20Sass.tmbundle:
-- source.sass
 http://svn.textmate.org/trunk/Review/Bundles/SecondLife%20LSL.tmbundle:
 - source.lsl
 http://svn.textmate.org/trunk/Review/Bundles/VHDL.tmbundle:
@@ -85,6 +83,8 @@ https://github.com/atom/language-csharp:
 - source.cs
 - source.csx
 - source.nant-build
+https://github.com/atom/language-gfm:
+- text.html.markdown
 https://github.com/atom/language-javascript:
 - source.js
 - source.js.regexp
@@ -92,6 +92,9 @@ https://github.com/atom/language-python:
 - source.python
 - source.regexp.python
 - text.python.traceback
+https://github.com/atom/language-sass:
+- source.css.scss
+- source.sass
 https://github.com/atom/language-shellscript:
 - source.shell
 - text.shell-session
@@ -170,6 +173,7 @@ https://github.com/lavrton/sublime-better-typescript:
 https://github.com/leafo/moonscript-tmbundle:
 - source.moonscript
 https://github.com/lsf37/Isabelle.tmbundle:
+- source.isabelle.root
 - source.isabelle.theory
 https://github.com/lunixbochs/x86-assembly-textmate-bundle:
 - source.asm.x86
@@ -323,8 +327,6 @@ https://github.com/textmate/lua.tmbundle:
 - source.lua
 https://github.com/textmate/make.tmbundle:
 - source.makefile
-https://github.com/textmate/markdown.tmbundle:
-- text.html.markdown
 https://github.com/textmate/matlab.tmbundle:
 - source.matlab
 - source.octave
@@ -424,3 +426,5 @@ https://raw.githubusercontent.com/tenbits/sublime-mask/release/Syntaxes/mask.tmL
 - source.mask
 https://github.com/l15n/fish-tmbundle:
 - source.fish
+https://raw.githubusercontent.com/andik/IDL-Syntax/master/IDL.tmLanguage:
+- source.webidl