Integrate some tips from ApiAxle blog

Just gathering suggestions from
http://blog.apiaxle.com/post/handy-git-tips-to-stop-you-getting-fired/