Update gitconfig 'aa' alias for Git 2.0.
Merge branch 'master' of https://github.com/vladh/dotfiles
Change tabs to spaces in .bash_profile. Add vim indent guides.