Annotated tags

Waiting on this to get merged which adds the feature to gitlab-shell: https://github.com/gitlabhq/gitlab-shell/pull/162

Looking for feedback.  Willing to change things if necessary.  Thanks!
Use `||` instead of `or`.