bringing clean up code from master into 1.0

Squashed commit of the following:

commit c36af36891a1e87b3927fc8ddce9ea5732c7d621
Author: Misty De Meo <mistydemeo@gmail.com>
Date:   Fri Aug 23 16:33:11 2013 -0700

    archivematicaFITS: Remove dead code, cleanup

    Removes all commented-out code that's not for documentation purposes,
    as well as unused/duplicate imports and variables.

commit baa611b29af35508767acafbd4573f5fb0b66ece
Author: Holly Becker <hbecker@artefactual.com>
Date:   Mon Aug 26 13:33:27 2013 -0700

    Removed unused client script

    refs #4757

    includeManuallyNormalizedFiles.py does not appear to be used or
    referenced anywhere.