thodg/cgminer

diff --git a/AUTHORS b/AUTHORS
index 29dbb77..c95f6a9 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,3 +1,4 @@
 Original CPU mining software: Jeff Garzik <jgarzik@pobox.com>
 GPU mining and rewrite: Con Kolivas <kernel@kolivas.org> 15qSxP1SQcUX3o4nhkfdbgyoWEFMomJ4rZ
+BitFORCE FPGA mining and refactor: Luke Dashjr <luke-jr+cgminer@utopios.org> 1NbRmS6a4dniwHHoSS9v3tEYUpP1Z5VVdL
 API+: Andrew Smith <kanoi@kano-kun.net> 1Jjk2LmktEQKnv8r2cZ9MvLiZwZ9gxabKm
diff --git a/README b/README
index 800c874..a7d41b9 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 
-This is a multi-threaded multi-pool CPU and GPU miner with ATI GPU monitoring,
-(over)clocking and fanspeed support for bitcoin and derivative coins. Do not
-use on multiple block chains at the same time!
+This is a multi-threaded multi-pool CPU, GPU, and FPGA miner with ATI GPU
+monitoring, (over)clocking and fanspeed support for bitcoin and derivative
+coins. Do not use on multiple block chains at the same time!
 
 This code is provided entirely free of charge by the programmer in his spare
 time so donations would be greatly appreciated. Please consider using the
@@ -161,10 +161,12 @@ Options for both config file and command line:
 --queue|-Q <arg>    Minimum number of work items to have queued (0 - 10) (default: 1)
 --quiet|-q          Disable logging output, display status and errors
 --real-quiet        Disable all output
+--remove-disabled   Remove disabled devices entirely, as if they didn't exist
 --retries|-r <arg>  Number of times to retry before giving up, if JSON-RPC call fails (-1 means never) (default: -1)
 --retry-pause|-R <arg> Number of seconds to pause, between retries (default: 5)
 --rotate <arg>      Change multipool strategy from failover to regularly rotate at N minutes (default: 0)
 --round-robin       Change multipool strategy from failover to round robin on failure
+--scan-serial|-S <arg> Serial port to probe for BitForce device
 --scan-time|-s <arg> Upper bound on time spent scanning current work, in seconds (default: 60)
 --sched-start <arg> Set a time of day in HH:MM to start mining (a once off without a stop time)
 --sched-stop <arg>  Set a time of day in HH:MM to stop mining (will quit without a start time)
diff --git a/main.c b/main.c
index 6062036..2627bef 100644
--- a/main.c
+++ b/main.c
@@ -1,7 +1,7 @@
 
 /*
  * Copyright 2011-2012 Con Kolivas
- * Copyright 2011 Luke Dashjr
+ * Copyright 2011-2012 Luke Dashjr
  * Copyright 2010 Jeff Garzik
  *
  * This program is free software; you can redistribute it and/or modify it