Pushing changes from the holidays

Signed-off-by: Joe Buck <buck@soe.ucsc.edu>