Readded standard 4 spaces tabbing for html
Added git-extras plugin.
Added word-diff, sb status, and rebase before push aliases.