Add scaling to average_combine
Refactor to simplify behavior if there is no scaling
Add scaling to median combine

Closes #61
Make scaling a property and update docs
Remove print statements
Merge pull request #123 from mwcraig/scale-combine

Add scaling to average_combine and median_combine