Added a few new words to vim dictionary
Better HTML indenting.
Merge remote-tracking branch 'origin/master'
Updated snipmate submodules.