Fix flake8 errors.
Use ternary.
Merge branch 'master' of github.com:joelthelion/autojump