refactored setup scripts
Merge pull request #45 from stdweird/newsetup

refactored setup scripts