added a thing for spacebars and also html
merged
added spacebars and adjusted html stuff to 2 instead of 4 spaces
added thing for html5
Merge branch 'master' of github.com:shmup/.vim