Add another ignore for Amazon checkstyle rules.
Merge various Vim/Fish changes.