Merge branch 'master' into refactor-preprocessor

Conflicts:
	preprocessor.py

Also bump the extras submodule to a version of pokemontools with a
suitable version of the preprocessor. The changes from 'master' for
preprocessor.py have been inserted into pokemontools prior to the
submodule bump.

prequeue.py

@@ -1,16 +1,28 @@
 # coding: utf-8
-
-# Starting a new python process to preprocess each source file
-# creates too much overhead. Instead, a list of files to preprocess
-# is fed into a script run from a single process.
+"""
+Starting a new python process to preprocess each source file creates too much
+overhead. Instead, a list of files to preprocess is fed into a script run from
+a single process.
+"""
 
 import os
 import sys
 import preprocessor
 
-if __name__ == '__main__':
+def main():
+    macros = preprocessor.load_pokecrystal_macros()
+    macro_table = preprocessor.preprocessor.make_macro_table(macros)
+
+    stdout = sys.stdout
+
     for source in sys.argv[1:]:
         dest = os.path.splitext(source)[0] + '.tx'
         sys.stdin  = open(source, 'r')
         sys.stdout = open(dest, 'w')
-        preprocessor.preprocess(preprocessor.macros)
+        preprocessor.preprocess(macro_table)
+
+    # reset stdout
+    sys.stdout = stdout
+
+if __name__ == '__main__':
+    main()