diff --git a/grammars.yml b/grammars.yml
index af3a2e3a..19b5fb83 100644
--- a/grammars.yml
+++ b/grammars.yml
@@ -11,6 +11,8 @@ http://svn.textmate.org/trunk/Review/Bundles/F%20Sharp.tmbundle:
 - source.fsharp
 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:
@@ -66,6 +68,8 @@ https://github.com/aroben/ada.tmbundle/raw/c45eed4d5f98fe3bcbbffbb9e436601ab5bbd
 https://github.com/aroben/ruby.tmbundle@4636a3023153c3034eb6ffc613899ba9cf33b41f:
 - source.ruby
 - text.html.erb
+https://github.com/asbjornenge/Docker.tmbundle:
+- source.dockerfile
 https://github.com/atom/language-coffee-script:
 - source.coffee
 - source.litcoffee
@@ -217,6 +221,8 @@ https://github.com/swannodette/textmate-clojure:
 - source.clojure
 https://github.com/technosophos/Vala-TMBundle:
 - source.vala
+https://github.com/textmate/ant.tmbundle:
+- text.xml.ant
 https://github.com/textmate/antlr.tmbundle:
 - source.antlr
 https://github.com/textmate/apache.tmbundle:
@@ -227,9 +233,13 @@ https://github.com/textmate/applescript.tmbundle:
 https://github.com/textmate/asp.tmbundle:
 - source.asp
 - text.html.asp
+https://github.com/textmate/bison.tmbundle:
+- source.bison
 https://github.com/textmate/c.tmbundle:
 - source.c
 - source.c++
+https://github.com/textmate/capnproto.tmbundle:
+- source.capnp
 https://github.com/textmate/cmake.tmbundle:
 - source.cache.cmake
 - source.cmake
@@ -256,6 +266,8 @@ https://github.com/textmate/fortran.tmbundle:
 - source.fortran.modern
 https://github.com/textmate/gettext.tmbundle:
 - source.po
+https://github.com/textmate/graphviz.tmbundle:
+- source.dot
 https://github.com/textmate/groovy.tmbundle:
 - source.groovy
 https://github.com/textmate/haskell.tmbundle:
@@ -304,8 +316,12 @@ https://github.com/textmate/markdown.tmbundle:
 https://github.com/textmate/matlab.tmbundle:
 - source.matlab
 - source.octave
+https://github.com/textmate/maven.tmbundle:
+- text.xml.pom
 https://github.com/textmate/nemerle.tmbundle:
 - source.nemerle
+https://github.com/textmate/ninja.tmbundle:
+- source.ninja
 https://github.com/textmate/objective-c.tmbundle:
 - source.objc
 - source.objc++
@@ -366,6 +382,8 @@ https://github.com/textmate/textile.tmbundle:
 https://github.com/textmate/textmate.tmbundle:
 - source.regexp.oniguruma
 - source.tm-properties
+https://github.com/textmate/thrift.tmbundle:
+- source.thrift
 https://github.com/textmate/toml.tmbundle:
 - source.toml
 https://github.com/textmate/verilog.tmbundle:
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index e1d9ee3d..5cd7c4a6 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -33,6 +33,15 @@ AGS Script:
   - .ash
   tm_scope: source.c++
 
+Ant Build System:
+  type: data
+  tm_scope: text.xml.ant
+  extensions:
+  - .ant.xml
+  filenames:
+  - build.xml
+  - ant.xml
+
 ANTLR:
   type: programming
   color: "#9DC3FF"
@@ -231,6 +240,12 @@ Befunge:
   extensions:
   - .befunge
 
+Bison:
+  type: programming
+  tm_scope: source.bison
+  extensions:
+  - .y
+
 BlitzBasic:
   type: programming
   aliases:
@@ -371,6 +386,12 @@ CSS:
   extensions:
   - .css
 
+Cap'n Proto:
+  type: programming
+  tm_scope: source.capnp
+  extensions:
+  - .capnp
+
 Ceylon:
   type: programming
   extensions:
@@ -578,12 +599,6 @@ DM:
   - byond
   tm_scope: source.c++
 
-DOT:
-  type: data
-  extensions:
-  - .dot
-  - .gv
-
 Darcs Patch:
   search_term: dpatch
   aliases:
@@ -605,6 +620,14 @@ Diff:
   aliases:
   - udiff
 
+Dockerfile:
+  type: data
+  tm_scope: source.dockerfile
+  extensions:
+  - .dockerfile
+  filenames:
+  - Dockerfile
+
 Dogescript:
   type: programming
   color: "#cca760"
@@ -927,6 +950,14 @@ Graph Modeling Language:
   extensions:
   - .gml
 
+Graphviz (DOT):
+  type: data
+  tm_scope: source.dot
+  extensions:
+  - .dot
+  - .DOT
+  - .gv
+
 Groff:
   extensions:
   - .man
@@ -1491,6 +1522,14 @@ Matlab:
   - .matlab
   - .m
 
+Maven POM:
+  type: data
+  tm_scope: text.xml.pom
+  extensions:
+  - .pom.xml
+  filenames:
+  - pom.xml
+
 Max:
   type: programming
   color: "#ce279c"
@@ -1591,6 +1630,12 @@ Nimrod:
   - .nim
   - .nimrod
 
+Ninja:
+  type: data
+  tm_scope: source.ninja
+  extensions:
+  - .ninja
+
 Nit:
   type: programming
   color: "#0d8921"
@@ -1785,6 +1830,7 @@ Parrot:
 
 Parrot Internal Representation:
   group: Parrot
+  tm_scope: source.parrot.pir
   type: programming
   aliases:
   - pir
@@ -2273,8 +2319,6 @@ Shell:
   - bash
   - sh
   - zsh
-  filenames:
-  - Dockerfile
 
 ShellSession:
   type: programming
@@ -2449,6 +2493,12 @@ Textile:
   extensions:
   - .textile
 
+Thrift:
+  type: programming
+  tm_scope: source.thrift
+  extensions:
+  - .thrift
+
 Turing:
   type: programming
   color: "#45f715"
@@ -2555,11 +2605,11 @@ Visual Basic:
   - vbnet
 
 Volt:
-    type: programming
-    color: "#0098db"
-    extensions:
-    - .volt
-    tm_scope: source.d
+  type: programming
+  color: "#0098db"
+  extensions:
+  - .volt
+  tm_scope: source.d
 
 XC:
   type: programming
diff --git a/samples/Shell/filenames/Dockerfile b/samples/Dockerfile/filenames/Dockerfile
similarity index 100%
rename from samples/Shell/filenames/Dockerfile
rename to samples/Dockerfile/filenames/Dockerfile
diff --git a/samples/Graphviz (DOT)/annoying.DOT b/samples/Graphviz (DOT)/annoying.DOT
new file mode 100644
index 00000000..fd20f4a4
--- /dev/null
+++ b/samples/Graphviz (DOT)/annoying.DOT	
@@ -0,0 +1,50 @@
+/* 
+  Huffman Tree DOT graph.
+
+  DOT Reference :  http://www.graphviz.org/doc/info/lang.html
+                   http://en.wikipedia.org/wiki/DOT_language
+  Timestamp     :  1415989074 
+  Phrase        :  'OH GOD WHY IS LINGUIST SO ANAL ABOUT THIS STUFF'
+
+  Generated on http://huffman.ooz.ie/
+*/
+
+digraph G {
+    edge [label=0];
+    graph [ranksep=0];
+    T [shape=record, label="{{T|4}|000}"];
+    S [shape=record, label="{{S|5}|001}"];
+    SPACE [shape=record, label="{{SPACE|9}|01}"];
+    A [shape=record, label="{{A|3}|1000}"];
+    H [shape=record, label="{{H|3}|1001}"];
+    U [shape=record, label="{{U|3}|1010}"];
+    L [shape=record, label="{{L|2}|10110}"];
+    N [shape=record, label="{{N|2}|10111}"];
+    I [shape=record, label="{{I|4}|1100}"];
+    O [shape=record, label="{{O|4}|1101}"];
+    G [shape=record, label="{{G|2}|11100}"];
+    F [shape=record, label="{{F|2}|11101}"];
+    GF [label=4];
+    W [shape=record, label="{{W|1}|111100}"];
+    Y [shape=record, label="{{Y|1}|111101}"];
+    B [shape=record, label="{{B|1}|111110}"];
+    D [shape=record, label="{{D|1}|111111}"];
+    BD [label=2];
+    WYBD [label=4];
+    GFWYBD [label=8];
+    47 -> 18 -> 9 -> T;
+    29 -> 13 -> 6 -> A;
+    7 -> U;
+    4 -> L;
+    16 -> 8 -> I;
+    GFWYBD -> GF -> G;
+    WYBD -> 2 -> W;
+    BD -> B;9 -> S [label=1];
+    18 -> SPACE [label=1];
+    6 -> H [label=1];
+    13 -> 7 -> 4 -> N [label=1];
+    8 -> O [label=1];
+    GF -> F [label=1];
+    2 -> Y [label=1];
+    47 -> 29 -> 16 -> GFWYBD -> WYBD -> BD -> D [label=1];
+}
\ No newline at end of file
diff --git a/samples/Graphviz (DOT)/sample.dot b/samples/Graphviz (DOT)/sample.dot
new file mode 100644
index 00000000..a55dc093
--- /dev/null
+++ b/samples/Graphviz (DOT)/sample.dot	
@@ -0,0 +1,74 @@
+/* 
+  Huffman Tree DOT graph.
+
+  DOT Reference :  http://www.graphviz.org/doc/info/lang.html
+                   http://en.wikipedia.org/wiki/DOT_language
+  Timestamp     :  1415988139 
+  Phrase        :  'SERIAL KILLER AND SEX OFFENDER ANGUS SINCLAIR IS JAILED FOR A MINIMUM OF 37 YEARS FOR THE 1977 WORLDS END MURDERS OF HELEN SCOTT AND CHRISTINE EADIE.'
+
+  Generated on http://huffman.ooz.ie/
+*/
+
+digraph G {
+    edge [label=0];
+    graph [ranksep=0];
+    node [shape=record];
+    U [label="{{U|3}|00000}"];
+    G [label="{{G|1}|0000100}"];
+    K [label="{{K|1}|0000101}"];
+    _3 [label="{{3|1}|0000110}"];
+    _9 [label="{{9|1}|0000111}"];
+    _39 [label=2];
+    L [label="{{L|7}|0001}"];
+    O [label="{{O|7}|0010}"];
+    Y [label="{{Y|1}|0011000}"];
+    X [label="{{X|1}|0011001}"];
+    YX [label=2];
+    J [label="{{J|1}|0011010}"];
+    W [label="{{W|1}|0011011}"];
+    JW [label=2];
+    YXJW [label=4];
+    M [label="{{M|4}|00111}"];
+    E [label="{{E|15}|010}"];
+    D [label="{{D|8}|0110}"];
+    T [label="{{T|4}|01110}"];
+    DOT [label="{{DOT|1}|0111100}"];
+    _1 [label="{{1|1}|0111101}"];
+    DOT1 [label=2];
+    _7 [label="{{7|3}|011111}"];
+    A [label="{{A|9}|1000}"];
+    N [label="{{N|9}|1001}"];
+    S [label="{{S|10}|1010}"];
+    I [label="{{I|11}|1011}"];
+    R [label="{{R|11}|1100}"];
+    C [label="{{C|3}|110100}"];
+    H [label="{{H|3}|110101}"];
+    F [label="{{F|6}|11011}"];
+    SPACE [label="{{SPACE|26}|111}"];
+    149 -> 61 -> 29 -> 14 -> 7 -> U;
+    4 -> 2 -> G;
+    _39 -> _3;
+    15 -> O;
+    8 -> YXJW -> YX -> Y;
+    JW -> J;
+    32 -> E;
+    17 -> D;
+    9 -> T;
+    5 -> DOT1 -> DOT;
+    88 -> 39 -> 18 -> A;
+    21 -> S;
+    49 -> 23 -> R;
+    12 -> 6 -> C;2 -> K [label=1];
+    7 -> 4 -> _39 -> _9 [label=1];
+    14 -> L [label=1];
+    YX -> X [label=1];
+    YXJW -> JW -> W [label=1];
+    29 -> 15 -> 8 -> M [label=1];
+    DOT1 -> _1 [label=1];
+    61 -> 32 -> 17 -> 9 -> 5 -> _7 [label=1];
+    18 -> N [label=1];
+    39 -> 21 -> I [label=1];
+    6 -> H [label=1];
+    23 -> 12 -> F [label=1];
+    149 -> 88 -> 49 -> SPACE [label=1];
+}
\ No newline at end of file
diff --git a/test/test_pedantic.rb b/test/test_pedantic.rb
index 2586f4ca..264c54f3 100644
--- a/test/test_pedantic.rb
+++ b/test/test_pedantic.rb
@@ -22,7 +22,7 @@ class TestPedantic < Test::Unit::TestCase
     file("languages.yml").lines.each do |line|
       if line =~ /^  extensions:$/
         extensions = []
-      elsif extensions && line =~ /^  - \.([\w-]+)( *#.*)?$/
+      elsif extensions && line =~ /^  - \.([\w\-\.]+)( *#.*)?$/
         extensions << $1
       else
         assert_sorted extensions[1..-1] if extensions