Merged branch from https://github.com/nschonni/quail.git git-dotfiles to dev locally. Fixes #57