Fix merge conflicts
Add scaffold for Funds
Add attribute migrations to funds.
Add rake task to populate funds from Watsi API