Adding a conflicted alias and rebuilding
Merge branch 'refs/heads/master' into johnk_git_alias
Merge pull request #3 from Lookingglass/johnk_git_alias

Johnk git alias