improved variable regex
Merge branch 'master' of github.com:Mytho/dotfiles