diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 277cf999..7991e4b0 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -64,7 +64,6 @@ Brainfuck:
   - .b
   - .bf
 BlitzMax:
-  :lexer: Text only
   :ext:
   - .bmx
 C:
@@ -178,7 +177,6 @@ F#:
   - .fsi
   - .fsx
 Factor:
-  :lexer: Text only
   :ext:
   - .factor
 FORTRAN:
@@ -559,7 +557,6 @@ XML:
   - .mxml
   - .rdf
 XQuery:
-  :lexer: Text only
   :ext:
   - .xqy
   - .xq
diff --git a/lib/linguist/lexers.yml b/lib/linguist/lexers.yml
index 7540a03f..306a4f5e 100644
--- a/lib/linguist/lexers.yml
+++ b/lib/linguist/lexers.yml
@@ -1,5 +1,5 @@
 # AUTOMATICALLY GENERATED BY bin/pygments-lexers
-# Pygments version 1.3.1
+# Pygments version 1.4
 ---
 - !ruby/struct:Linguist::Lexer
   name: JavaScript+Mako
@@ -70,6 +70,13 @@
   - *.tpl
   mimetypes:
   - application/x-smarty
+- !ruby/struct:Linguist::Lexer
+  name: Protocol Buffer
+  aliases:
+  - protobuf
+  filenames:
+  - *.proto
+  mimetypes:
 - !ruby/struct:Linguist::Lexer
   name: ApacheConf
   aliases:
@@ -103,14 +110,15 @@
   - text/x-javascript+genshi
   - text/javascript+genshi
 - !ruby/struct:Linguist::Lexer
-  name: Erlang
+  name: Scheme
   aliases:
-  - erlang
+  - scheme
+  - scm
   filenames:
-  - *.erl
-  - *.hrl
+  - *.scm
   mimetypes:
-  - text/x-erlang
+  - text/x-scheme
+  - application/x-scheme
 - !ruby/struct:Linguist::Lexer
   name: CoffeeScript
   aliases:
@@ -176,6 +184,15 @@
   filenames:
   mimetypes:
   - application/xml+smarty
+- !ruby/struct:Linguist::Lexer
+  name: autohotkey
+  aliases:
+  - ahk
+  filenames:
+  - *.ahk
+  - *.ahkl
+  mimetypes:
+  - text/x-autohotkey
 - !ruby/struct:Linguist::Lexer
   name: Felix
   aliases:
@@ -192,6 +209,7 @@
   - cmake
   filenames:
   - *.cmake
+  - CMakeLists.txt
   mimetypes:
   - text/x-cmake
 - !ruby/struct:Linguist::Lexer
@@ -234,6 +252,24 @@
   filenames:
   mimetypes:
   - application/xml+mako
+- !ruby/struct:Linguist::Lexer
+  name: Scaml
+  aliases:
+  - scaml
+  - SCAML
+  filenames:
+  - *.scaml
+  mimetypes:
+  - text/x-scaml
+- !ruby/struct:Linguist::Lexer
+  name: MAQL
+  aliases:
+  - maql
+  filenames:
+  - *.maql
+  mimetypes:
+  - text/x-gooddata-maql
+  - application/x-gooddata-maql
 - !ruby/struct:Linguist::Lexer
   name: Boo
   aliases:
@@ -291,6 +327,14 @@
   - *.lgt
   mimetypes:
   - text/x-logtalk
+- !ruby/struct:Linguist::Lexer
+  name: SCSS
+  aliases:
+  - scss
+  filenames:
+  - *.scss
+  mimetypes:
+  - text/x-scss
 - !ruby/struct:Linguist::Lexer
   name: BBCode
   aliases:
@@ -329,6 +373,15 @@
   filenames:
   - control
   mimetypes:
+- !ruby/struct:Linguist::Lexer
+  name: Jade
+  aliases:
+  - jade
+  - JADE
+  filenames:
+  - *.jade
+  mimetypes:
+  - text/x-jade
 - !ruby/struct:Linguist::Lexer
   name: RHTML
   aliases:
@@ -339,6 +392,13 @@
   - *.rhtml
   mimetypes:
   - text/html+ruby
+- !ruby/struct:Linguist::Lexer
+  name: XML+Velocity
+  aliases:
+  - xml+velocity
+  filenames:
+  mimetypes:
+  - application/xml+velocity
 - !ruby/struct:Linguist::Lexer
   name: JavaScript+Cheetah
   aliases:
@@ -445,6 +505,7 @@
   - lua
   filenames:
   - *.lua
+  - *.wlua
   mimetypes:
   - text/x-lua
   - application/x-lua
@@ -584,6 +645,14 @@
   - *.asmx
   - *.axd
   mimetypes:
+- !ruby/struct:Linguist::Lexer
+  name: Properties
+  aliases:
+  - properties
+  filenames:
+  - *.properties
+  mimetypes:
+  - text/x-java-properties
 - !ruby/struct:Linguist::Lexer
   name: Ragel in Ruby Host
   aliases:
@@ -592,6 +661,15 @@
   filenames:
   - *.rl
   mimetypes:
+- !ruby/struct:Linguist::Lexer
+  name: BlitzMax
+  aliases:
+  - blitzmax
+  - bmax
+  filenames:
+  - *.bmx
+  mimetypes:
+  - text/x-bmx
 - !ruby/struct:Linguist::Lexer
   name: HTML+Genshi
   aliases:
@@ -619,7 +697,6 @@
   filenames:
   - *.ini
   - *.cfg
-  - *.properties
   mimetypes:
   - text/x-ini
 - !ruby/struct:Linguist::Lexer
@@ -655,6 +732,14 @@
   filenames:
   mimetypes:
   - text/css+smarty
+- !ruby/struct:Linguist::Lexer
+  name: Text only
+  aliases:
+  - text
+  filenames:
+  - *.txt
+  mimetypes:
+  - text/plain
 - !ruby/struct:Linguist::Lexer
   name: ANTLR With C# Target
   aliases:
@@ -695,13 +780,12 @@
   - *.applescript
   mimetypes:
 - !ruby/struct:Linguist::Lexer
-  name: Text only
+  name: HTML+Smarty
   aliases:
-  - text
+  - html+smarty
   filenames:
-  - *.txt
   mimetypes:
-  - text/plain
+  - text/html+smarty
 - !ruby/struct:Linguist::Lexer
   name: Literate Haskell
   aliases:
@@ -834,6 +918,11 @@
   filenames:
   - *.vim
   - .vimrc
+  - .exrc
+  - .gvimrc
+  - _vimrc
+  - _exrc
+  - _gvimrc
   mimetypes:
   - text/x-vim
 - !ruby/struct:Linguist::Lexer
@@ -844,12 +933,30 @@
   filenames:
   mimetypes:
   - text/css+genshi
+- !ruby/struct:Linguist::Lexer
+  name: Fancy
+  aliases:
+  - fancy
+  - fy
+  filenames:
+  - *.fy
+  - *.fancypack
+  mimetypes:
+  - text/x-fancysrc
 - !ruby/struct:Linguist::Lexer
   name: Ragel
   aliases:
   - ragel
   filenames:
   mimetypes:
+- !ruby/struct:Linguist::Lexer
+  name: Scalate Server Page
+  aliases:
+  - ssp
+  filenames:
+  - *.ssp
+  mimetypes:
+  - application/x-ssp
 - !ruby/struct:Linguist::Lexer
   name: XML+Evoque
   aliases:
@@ -899,6 +1006,13 @@
   filenames:
   mimetypes:
   - text/x-lighttpd-conf
+- !ruby/struct:Linguist::Lexer
+  name: HTML+Velocity
+  aliases:
+  - html+velocity
+  filenames:
+  mimetypes:
+  - text/html+velocity
 - !ruby/struct:Linguist::Lexer
   name: Ragel in D Host
   aliases:
@@ -955,6 +1069,8 @@
   filenames:
   - *.f
   - *.f90
+  - *.F
+  - *.F90
   mimetypes:
   - text/x-fortran
 - !ruby/struct:Linguist::Lexer
@@ -996,6 +1112,7 @@
   - dylan
   filenames:
   - *.dylan
+  - *.dyl
   mimetypes:
   - text/x-dylan
 - !ruby/struct:Linguist::Lexer
@@ -1061,6 +1178,14 @@
   mimetypes:
   - text/x-rst
   - text/prs.fallenstein.rst
+- !ruby/struct:Linguist::Lexer
+  name: Velocity
+  aliases:
+  - velocity
+  filenames:
+  - *.vm
+  - *.fhtml
+  mimetypes:
 - !ruby/struct:Linguist::Lexer
   name: IRC logs
   aliases:
@@ -1126,7 +1251,6 @@
   - makefile
   - Makefile.*
   - GNUmakefile
-  - basemake
   mimetypes:
   - text/x-makefile
 - !ruby/struct:Linguist::Lexer
@@ -1193,6 +1317,7 @@
   aliases:
   - rb
   - ruby
+  - duby
   filenames:
   - *.rb
   - *.rbw
@@ -1200,16 +1325,18 @@
   - *.rake
   - *.gemspec
   - *.rbx
+  - *.duby
   mimetypes:
   - text/x-ruby
   - application/x-ruby
 - !ruby/struct:Linguist::Lexer
-  name: HTML+Smarty
+  name: Python 3.0 Traceback
   aliases:
-  - html+smarty
+  - py3tb
   filenames:
+  - *.py3tb
   mimetypes:
-  - text/html+smarty
+  - text/x-python3-traceback
 - !ruby/struct:Linguist::Lexer
   name: POVRay
   aliases:
@@ -1234,6 +1361,16 @@
   - *.evoque
   mimetypes:
   - application/x-evoque
+- !ruby/struct:Linguist::Lexer
+  name: eC
+  aliases:
+  - ec
+  filenames:
+  - *.ec
+  - *.eh
+  mimetypes:
+  - text/x-echdr
+  - text/x-ecsrc
 - !ruby/struct:Linguist::Lexer
   name: Java Server Page
   aliases:
@@ -1274,6 +1411,19 @@
   - matlabsession
   filenames:
   mimetypes:
+- !ruby/struct:Linguist::Lexer
+  name: Mason
+  aliases:
+  - mason
+  filenames:
+  - *.m
+  - *.mhtml
+  - *.mc
+  - *.mi
+  - autohandler
+  - dhandler
+  mimetypes:
+  - application/x-mason
 - !ruby/struct:Linguist::Lexer
   name: HTML+PHP
   aliases:
@@ -1287,13 +1437,23 @@
   - application/x-httpd-php4
   - application/x-httpd-php5
 - !ruby/struct:Linguist::Lexer
-  name: Python 3.0 Traceback
+  name: PostScript
   aliases:
-  - py3tb
+  - postscript
   filenames:
-  - *.py3tb
+  - *.ps
+  - *.eps
   mimetypes:
-  - text/x-python3-traceback
+  - application/postscript
+- !ruby/struct:Linguist::Lexer
+  name: verilog
+  aliases:
+  - v
+  filenames:
+  - *.v
+  - *.sv
+  mimetypes:
+  - text/x-verilog
 - !ruby/struct:Linguist::Lexer
   name: ANTLR With Java Target
   aliases:
@@ -1302,6 +1462,16 @@
   - *.G
   - *.g
   mimetypes:
+- !ruby/struct:Linguist::Lexer
+  name: Tcl
+  aliases:
+  - tcl
+  filenames:
+  - *.tcl
+  mimetypes:
+  - text/x-tcl
+  - text/x-script.tcl
+  - application/x-tcl
 - !ruby/struct:Linguist::Lexer
   name: JavaScript+Ruby
   aliases:
@@ -1334,6 +1504,24 @@
   - *.cxx-objdump
   mimetypes:
   - text/x-cpp-objdump
+- !ruby/struct:Linguist::Lexer
+  name: Ioke
+  aliases:
+  - ioke
+  - ik
+  filenames:
+  - *.ik
+  mimetypes:
+  - text/x-iokesrc
+- !ruby/struct:Linguist::Lexer
+  name: PyPy Log
+  aliases:
+  - pypylog
+  - pypy
+  filenames:
+  - *.pypylog
+  mimetypes:
+  - application/x-pypylog
 - !ruby/struct:Linguist::Lexer
   name: Python 3
   aliases:
@@ -1386,15 +1574,14 @@
   - text/x-cython
   - application/x-cython
 - !ruby/struct:Linguist::Lexer
-  name: Scheme
+  name: Erlang
   aliases:
-  - scheme
-  - scm
+  - erlang
   filenames:
-  - *.scm
+  - *.erl
+  - *.hrl
   mimetypes:
-  - text/x-scheme
-  - application/x-scheme
+  - text/x-erlang
 - !ruby/struct:Linguist::Lexer
   name: Erlang erl session
   aliases:
@@ -1439,15 +1626,20 @@
   mimetypes:
   - application/x-myghty
 - !ruby/struct:Linguist::Lexer
-  name: Tcl
+  name: Duel
   aliases:
-  - tcl
+  - duel
+  - Duel Engine
+  - Duel View
+  - JBST
+  - jbst
+  - JsonML+BST
   filenames:
-  - *.tcl
+  - *.duel
+  - *.jbst
   mimetypes:
-  - text/x-tcl
-  - text/x-script.tcl
-  - application/x-tcl
+  - text/x-duel
+  - text/x-jbst
 - !ruby/struct:Linguist::Lexer
   name: MOOCode
   aliases:
@@ -1511,6 +1703,14 @@
   mimetypes:
   - application/x-cheetah
   - application/x-spitfire
+- !ruby/struct:Linguist::Lexer
+  name: GoodData-CL
+  aliases:
+  - gooddata-cl
+  filenames:
+  - *.gdc
+  mimetypes:
+  - text/x-gooddata-cl
 - !ruby/struct:Linguist::Lexer
   name: Objective-C
   aliases:
@@ -1530,6 +1730,7 @@
   filenames:
   - *.js
   mimetypes:
+  - application/javascript
   - application/x-javascript
   - text/x-javascript
   - text/javascript
@@ -1570,6 +1771,17 @@
   - *.G
   - *.g
   mimetypes:
+- !ruby/struct:Linguist::Lexer
+  name: Hybris
+  aliases:
+  - hybris
+  - hy
+  filenames:
+  - *.hy
+  - *.hyb
+  mimetypes:
+  - text/x-hybris
+  - application/x-hybris
 - !ruby/struct:Linguist::Lexer
   name: JavaScript+PHP
   aliases:
@@ -1580,6 +1792,25 @@
   - application/x-javascript+php
   - text/x-javascript+php
   - text/javascript+php
+- !ruby/struct:Linguist::Lexer
+  name: Factor
+  aliases:
+  - factor
+  filenames:
+  - *.factor
+  mimetypes:
+  - text/x-factor
+- !ruby/struct:Linguist::Lexer
+  name: XQuery
+  aliases:
+  - xquery
+  - xqy
+  filenames:
+  - *.xqy
+  - *.xquery
+  mimetypes:
+  - text/xquery
+  - application/xquery
 - !ruby/struct:Linguist::Lexer
   name: Ragel in Objective C Host
   aliases:
@@ -1596,6 +1827,17 @@
   mimetypes:
   - application/xml+django
   - application/xml+jinja
+- !ruby/struct:Linguist::Lexer
+  name: Awk
+  aliases:
+  - awk
+  - gawk
+  - mawk
+  - nawk
+  filenames:
+  - *.awk
+  mimetypes:
+  - application/x-awk
 - !ruby/struct:Linguist::Lexer
   name: ANTLR With Ruby Target
   aliases:
diff --git a/test/test_language.rb b/test/test_language.rb
index c3e0a499..42854219 100644
--- a/test/test_language.rb
+++ b/test/test_language.rb
@@ -180,13 +180,13 @@ class TestLanguage < Test::Unit::TestCase
     assert_equal Lexer['ActionScript 3'],    Language['ActionScript'].lexer
     assert_equal Lexer['Ada'],               Language['Ada'].lexer
     assert_equal Lexer['AppleScript'],       Language['AppleScript'].lexer
-    # assert_equal Lexer['Arc']  ,             Language['Arc'].lexer
+    assert_equal Lexer['Text only'],         Language['Arc'].lexer
     assert_equal Lexer['NASM'],              Language['Assembly'].lexer
     assert_equal Lexer['Batchfile'],         Language['Batchfile'].lexer
     assert_equal Lexer['Befunge'],           Language['Befunge'].lexer
     assert_equal Lexer['Boo'],               Language['Boo'].lexer
     assert_equal Lexer['Brainfuck'],         Language['Brainfuck'].lexer
-    # assert_equal Lexer['BlitzMax'],          Language['BlitzMax'].lexer
+    assert_equal Lexer['BlitzMax'],          Language['BlitzMax'].lexer
     assert_equal Lexer['C'],                 Language['C'].lexer
     assert_equal Lexer['C#'],                Language['C#'].lexer
     assert_equal Lexer['C++'],               Language['C++'].lexer
@@ -204,11 +204,11 @@ class TestLanguage < Test::Unit::TestCase
     assert_equal Lexer['Diff'],              Language['Diff'].lexer
     assert_equal Lexer['D-ObjDump'],         Language['d-objdump'].lexer
     assert_equal Lexer['Dylan'],             Language['Dylan'].lexer
-    # assert_equal Lexer['Eiffel'],            Language['Eiffel'].lexer
+    assert_equal Lexer['Text only'],         Language['Eiffel'].lexer
     assert_equal Lexer['Scheme'],            Language['Emacs Lisp'].lexer
     assert_equal Lexer['Erlang'],            Language['Erlang'].lexer
     assert_equal Lexer['OCaml'],             Language['F#'].lexer
-    # assert_equal Lexer['Factor'],            Language['Factor'].lexer
+    assert_equal Lexer['Factor'],            Language['Factor'].lexer
     assert_equal Lexer['Fortran'],           Language['FORTRAN'].lexer
     assert_equal Lexer['GAS'],               Language['GAS'].lexer
     assert_equal Lexer['Genshi'],            Language['Genshi'].lexer
@@ -283,7 +283,7 @@ class TestLanguage < Test::Unit::TestCase
     assert_equal Lexer['VimL'],              Language['VimL'].lexer
     assert_equal Lexer['Text only'],         Language['Visual Basic'].lexer
     assert_equal Lexer['XML'],               Language['XML'].lexer
-    # assert_equal Lexer['XQuery'],            Language['XQuery'].lexer
+    assert_equal Lexer['XQuery'],            Language['XQuery'].lexer
     assert_equal Lexer['C'],                 Language['XS'].lexer
     assert_equal Lexer['YAML'],              Language['YAML'].lexer
     assert_equal Lexer['Java Server Page'],  Language['Java Server Pages'].lexer
diff --git a/test/test_lexer.rb b/test/test_lexer.rb
index 72ddaf43..120726f1 100644
--- a/test/test_lexer.rb
+++ b/test/test_lexer.rb
@@ -39,9 +39,9 @@ class TestLexer < Test::Unit::TestCase
   end
 
   def test_aliases
-    assert_equal ['rb', 'ruby'],   Lexer['Ruby'].aliases
-    assert_equal ['python', 'py'], Lexer['Python'].aliases
-    assert_equal ['perl', 'pl'],   Lexer['Perl'].aliases
+    assert_equal ['rb', 'ruby', 'duby'], Lexer['Ruby'].aliases
+    assert_equal ['python', 'py'],       Lexer['Python'].aliases
+    assert_equal ['perl', 'pl'],         Lexer['Perl'].aliases
   end
 
   def test_eql