Changed MINIMUM_GAIN to an extern so we can pass it in as a command-line argument.  Changed -m flag to -g.  Added column_by_name() method to matrix.py
fixed merge conflicts