vim copy paste, and some git alias stuff
Merge branch 'master' of github.com:kenoir/dotfiles