Refactor for source vs. sources; And new source.Func signature
Update Readme; Travis