finish removal of separateOutput
Merge pull request #7 from kbansal/portfolio

finish removal of separateOutput
Fix for SCM detection
reenable some regression tests (currently failing)