Still tracking down lines which have changed, very close to being caught up.
Signed-off-by: Isaac (.ike) Levy <ike@blackskyresearch.net>