a few updates
fucking conflict, RESOLVED
Made a few updates
Merge branch 'develop'

* develop:
  Autoupdate rerere resolutions
  Added note to where you can see documentation
  Added some to use by default
  Added some crappy gitkeep files
  meh
  neat
  small update
  added vim
  Unlimited history
  bug fix and some new stuff coming
Added some new git prompt stuff
meh
Added debug log function
Updated readme
A few updates
Renamed a few alias files
Added and modified some aliases
Added config for task warrior
Merge branch 'develop'

* develop: (39 commits)
  Made a few updates
  Updated so options can be changed, in the future I would like to make this repository specific
  Likes to find issues with phpunit.xml.dist files
  Updated the pre-commit hook to be less annoying since old code seems to trigger it more
  made a few updates for php syntax checking
  Added more composer stuff and update the global ignore file to include .scrutinizer.yml files
  Updated to updated and not install
  Added more tools to composer.json
  Added pre-commit hook for phpcs
  Updated for brew bash-completions
  Added new alias to empty trash
  Added phpcs
  More destructive than ever
  Updated
  put it back
  and updated the repo I will
  updated
  comments and such
  Removed YouCompleteMe since I could not get the damn thing to work
  Updated
  ...
Merge conflict
Merge conflict resolved
Merge conflict