Cleaned up main init
Cleaned up main init


Former-commit-id: 356424159909693f1a0dd57307e5bcea02b268f5
Former-commit-id: 2f942fadeb25839d3bdb76fb87b550131fd2f9c6
amdouglas/OpenPNM,amdouglas/OpenPNM,PMEAL/OpenPNM,TomTranter/OpenPNM,stadelmanma/OpenPNM