Fixing merge issues
Merge branch 'master' of github.com:cmckendry/Configurations

* 'master' of github.com:cmckendry/Configurations:
  Making hook to automatically update files silent
  Adding hook to automatically update files
  Fixing merge issues
Adding "phone home" aliases for bash