Remove hack for funding source display and move it into bc models
Merge in latest fixes from master