fixed vim Y and visual indent, added typical git aliases
re-branched from master
Merge branch 'ubuntu' of github.com:shawndumas/dotfiles into ubuntu