preparation for private submodule approach
cleaned up
Merge pull request #163 from MartijnR/sane_deployment

Sane deployment - phase I