38 files changed, 12 insertions, 25 deletions
diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644
index d612a87f..00000000
--- a/AUTHORS
+++ /dev/null
@@ -1 +0,0 @@
-Peter Reijnders, Wictor Lund
diff --git a/COPYING b/COPYING
index 18a9cfe8..7fa1cdf0 100644
--- a/COPYING
+++ b/COPYING
@@ -1,5 +1,5 @@
 
-Copyright (c) 2006-2018 Adrian Thurston <thurston@colm.net>
+Copyright (c) 2001-2018 Adrian Thurston <thurston@colm.net> et al.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
diff --git a/ragel-repos/CREDITS b/CREDITS
index 32a3a1b7..f9b9fb43 100644
--- a/ragel-repos/CREDITS
+++ b/CREDITS
@@ -1,8 +1,16 @@
+                     Colm Programming Language -- CREDITS
+                     ====================================
+
+The Colm Programming Language was designed and developed by by myself,
+Adrian Thurston <thurston@colm.net> as an implementation of the ideas developed
+in my PhD thesis. Several others have helped, including Peter Reijnders and
+Wictor Lund. Please also see github contributors list.
+
                      Ragel State Machine Compiler -- CREDITS
                      =======================================
 
-Ragel was designed and written by Adrian Thurston <thurston@colm.net>. Many
-others have helped out along the way.
+Ragel was designed and developed by myself, Adrian Thurston <thurston@colm.net>.
+Many others have helped out along the way.
 
 * Financial support provided by Arbor Networks and Barracuda
   Networks.
@@ -51,3 +59,4 @@ others have helped out along the way.
     Sherlock, Conrad Steenberg, Jan Engelhardt, Kenta Sato, Harald Grossauer,
     Kamil Klimkiewicz, Hesham Wahba, Phil Carmody, Yang Hong
 
+* Please also see the github contributors list.
diff --git a/ragel-repos/contrib/.gitignore b/contrib/.gitignore
index 9ee64540..9ee64540 100644
--- a/ragel-repos/contrib/.gitignore
+++ b/contrib/.gitignore
diff --git a/ragel-repos/contrib/Makefile.am b/contrib/Makefile.am
index 7ef7e8d9..7ef7e8d9 100644
--- a/ragel-repos/contrib/Makefile.am
+++ b/contrib/Makefile.am
diff --git a/ragel-repos/contrib/ragel.m4 b/contrib/ragel.m4
index e7b42425..e7b42425 100644
--- a/ragel-repos/contrib/ragel.m4
+++ b/contrib/ragel.m4
diff --git a/ragel-repos/contrib/ragel.make b/contrib/ragel.make
index f7a71b5b..f7a71b5b 100644
--- a/ragel-repos/contrib/ragel.make
+++ b/contrib/ragel.make
diff --git a/ragel-repos/contrib/unicode2ragel.rb b/contrib/unicode2ragel.rb
index d64e601d..d64e601d 100644
--- a/ragel-repos/contrib/unicode2ragel.rb
+++ b/contrib/unicode2ragel.rb
diff --git a/ragel-repos/examples/.gitignore b/examples/.gitignore
index b309591b..b309591b 100644
--- a/ragel-repos/examples/.gitignore
+++ b/examples/.gitignore
diff --git a/ragel-repos/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 6ff75544..6ff75544 100644
--- a/ragel-repos/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
diff --git a/ragel-repos/examples/Makefile.am b/examples/Makefile.am
index 7cda0171..7cda0171 100644
--- a/ragel-repos/examples/Makefile.am
+++ b/examples/Makefile.am
diff --git a/ragel-repos/examples/README b/examples/README
index 12773cb3..12773cb3 100644
--- a/ragel-repos/examples/README
+++ b/examples/README
diff --git a/ragel-repos/examples/atoi.rl b/examples/atoi.rl
index 7164b68d..7164b68d 100644
--- a/ragel-repos/examples/atoi.rl
+++ b/examples/atoi.rl
diff --git a/ragel-repos/examples/awkemu.rl b/examples/awkemu.rl
index 6615943d..6615943d 100644
--- a/ragel-repos/examples/awkemu.rl
+++ b/examples/awkemu.rl
diff --git a/ragel-repos/examples/awkequiv.awk b/examples/awkequiv.awk
index 9877dd36..9877dd36 100755
--- a/ragel-repos/examples/awkequiv.awk
+++ b/examples/awkequiv.awk
diff --git a/ragel-repos/examples/clang.rl b/examples/clang.rl
index 60491e5e..60491e5e 100644
--- a/ragel-repos/examples/clang.rl
+++ b/examples/clang.rl
diff --git a/ragel-repos/examples/concurrent.rl b/examples/concurrent.rl
index 224f9601..224f9601 100644
--- a/ragel-repos/examples/concurrent.rl
+++ b/examples/concurrent.rl
diff --git a/ragel-repos/examples/cppscan.lex b/examples/cppscan.lex
index fb662538..fb662538 100644
--- a/ragel-repos/examples/cppscan.lex
+++ b/examples/cppscan.lex
diff --git a/ragel-repos/examples/cppscan.rec b/examples/cppscan.rec
index 43f297d8..43f297d8 100644
--- a/ragel-repos/examples/cppscan.rec
+++ b/examples/cppscan.rec
diff --git a/ragel-repos/examples/cppscan.rl b/examples/cppscan.rl
index 1ead5aa6..1ead5aa6 100644
--- a/ragel-repos/examples/cppscan.rl
+++ b/examples/cppscan.rl
diff --git a/ragel-repos/examples/format.rl b/examples/format.rl
index f8a37beb..f8a37beb 100644
--- a/ragel-repos/examples/format.rl
+++ b/examples/format.rl
diff --git a/ragel-repos/examples/go/.gitignore b/examples/go/.gitignore
index f8b421d6..f8b421d6 100644
--- a/ragel-repos/examples/go/.gitignore
+++ b/examples/go/.gitignore
diff --git a/ragel-repos/examples/go/Makefile b/examples/go/Makefile
index 536afcc7..536afcc7 100644
--- a/ragel-repos/examples/go/Makefile
+++ b/examples/go/Makefile
diff --git a/ragel-repos/examples/go/README b/examples/go/README
index bdb924b8..bdb924b8 100644
--- a/ragel-repos/examples/go/README
+++ b/examples/go/README
diff --git a/ragel-repos/examples/go/atoi.rl b/examples/go/atoi.rl
index 97c5163e..97c5163e 100644
--- a/ragel-repos/examples/go/atoi.rl
+++ b/examples/go/atoi.rl
diff --git a/ragel-repos/examples/go/rpn.rl b/examples/go/rpn.rl
index 2ad0a2db..2ad0a2db 100644
--- a/ragel-repos/examples/go/rpn.rl
+++ b/examples/go/rpn.rl
diff --git a/ragel-repos/examples/go/url.rl b/examples/go/url.rl
index e94d59c6..e94d59c6 100644
--- a/ragel-repos/examples/go/url.rl
+++ b/examples/go/url.rl
diff --git a/ragel-repos/examples/go/url_authority.rl b/examples/go/url_authority.rl
index 3e651ad0..3e651ad0 100644
--- a/ragel-repos/examples/go/url_authority.rl
+++ b/examples/go/url_authority.rl
diff --git a/ragel-repos/examples/gotocallret.rl b/examples/gotocallret.rl
index 32c01a2c..32c01a2c 100644
--- a/ragel-repos/examples/gotocallret.rl
+++ b/examples/gotocallret.rl
diff --git a/ragel-repos/examples/mailbox.rl b/examples/mailbox.rl
index 94590fdd..94590fdd 100644
--- a/ragel-repos/examples/mailbox.rl
+++ b/examples/mailbox.rl
diff --git a/ragel-repos/examples/params.rl b/examples/params.rl
index a8ffeae9..a8ffeae9 100644
--- a/ragel-repos/examples/params.rl
+++ b/examples/params.rl
diff --git a/ragel-repos/examples/pullscan.rl b/examples/pullscan.rl
index d9e8a579..d9e8a579 100644
--- a/ragel-repos/examples/pullscan.rl
+++ b/examples/pullscan.rl
diff --git a/ragel-repos/examples/rlscan.rl b/examples/rlscan.rl
index d4d4bf97..d4d4bf97 100644
--- a/ragel-repos/examples/rlscan.rl
+++ b/examples/rlscan.rl
diff --git a/ragel-repos/examples/statechart.rl b/examples/statechart.rl
index a04471b5..a04471b5 100644
--- a/ragel-repos/examples/statechart.rl
+++ b/examples/statechart.rl
diff --git a/ragel-repos/examples/uri.rl b/examples/uri.rl
index 185a76c6..185a76c6 100644
--- a/ragel-repos/examples/uri.rl
+++ b/examples/uri.rl
diff --git a/ragel-repos/AUTHORS b/ragel-repos/AUTHORS
deleted file mode 100644
index 7ca82d06..00000000
--- a/ragel-repos/AUTHORS
+++ /dev/null
@@ -1 +0,0 @@
-See CREDITS.
diff --git a/ragel-repos/COPYING b/ragel-repos/COPYING
deleted file mode 100644
index 7fa1cdf0..00000000
--- a/ragel-repos/COPYING
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Copyright (c) 2001-2018 Adrian Thurston <thurston@colm.net> et al.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/ragel-repos/ragel.vim b/ragel.vim
index a0357626..a0357626 100644
--- a/ragel-repos/ragel.vim
+++ b/ragel.vim