setup
Merge branch 'master' of https://github.com/mgruesen/parallel-term