fixes for merge issues
Merge branch 'develop' of https://github.com/libbyshoop/csinparallel into ls-dev
small change to git instructions
merge ls-dev into develop