Swapped the Q_POINTS and K_POINTS cards for input only.

Now the K_POINTS for an SRB and non-SRB calculation will be
consistent, which should be less confusing: only Q_POINTS must
be added.

Note that this is a change in inputs only.  Within the code,
k-points are still the coarse sample and q-points the fine sample.