Updating scripts for separation of concerns
Merge branch 'master' of github.com:hegemonia/dibstarter
Merge branch 'master' of github.com:hegemonia/dibstarter