redo portfolios
refactor return calc
Merge pull request #7 from travis6888/develop

redo and refactor