Fixes needed now that funding sources are

in their own table
Merge branch 'master' into rails_3_1