don't let screen rename terminal
Merge branch 'master' into amazon