Omit any non-vi* mode by default
Make new test work in python 3
Adjust messages for python-3.3
Merge branch 'zsh-vi-mode' into local-develop
Merge branch 'fix-finish_args-typo' into local-develop