Replaced charset property to the html5 equivalent

Also, most html5 style-guides do not use ending slashes with
self-closing tags.
Merge pull request #354 from vim-guru/master

Replaced charset property to the html5 equivalent
Merge remote-tracking branch 'upstream/master'