Add in default modulefile for edison
Pulling in latest changes from master
updates