Merge branch 'master' of https://github.com/Tacahilo/myvim
Add HTML & ERB rule for vim-smartinput