updates to run with mac/linux#75

ktehranchi wants to merge 9 commits into

pencleanenergy:masterpencleanenergy/MATCH-model:masterfrom

ktehranchi:masterktehranchi/MATCH-model:masterCopy head branch name to clipboard