Compose key support
Merge branch 'master' of github.com:thcipriani/dotfiles