Merge branch 'master' of github.com:curipha/dotfiles
Add key timeout settings
Fix ruby keymapping
Add other ruby keymappings