Merge branch 'master', remote-tracking branch 'origin'

* origin:
  Erroneously deleted + on self.options
  [#177] @alloy's suggestions
  Revert .git behaviour and refactoring
  [fix] Support for dashes in GitHub repo and author
  [#177] Fix for GitHub repos missing final .git in the source
  [#177] Added --extended option
  Tweaks to regex and coloring
  [#177] Search command improvements

* master: