Small bugfix in short_path
Adding Term and Unicode to screen arguments
Merge branches 'master' and 'changes'