new env.sh and fixed user bashrc
Merge branch 'master' of github.com:ipa-nhg/setup
Merge pull request #31 from ipa-nhg/master

New env.sh version