Refactor to simplify
added vancouver
Merge branch 'master' of https://github.com/josephcoombes/git-mania