bcongdon Merge branch 'master' of https://github.com/bcongdon/git-trophy