new aliases
added git-divergence script (from: http://rakeroutes.com/blog/getting-up-to-speed-on-a-new-git-repo/ )