Merged from stash
Fixed a typo
Merge branch 'master' of github.com:tarwich/Settings
Added YAML mode.
More keybinds and plugins.