Merge commit '891d0f3a760adbe77036b64286cbcba22094e5ba'

* commit '891d0f3a760adbe77036b64286cbcba22094e5ba':
  Squashed '.zsh.d/external/autojump/' changes from a74ef31..a17d904
Squashed '.zsh.d/external/autojump/' changes from a74ef31..a17d904

a17d904 update changelog
0be4506 Merge branch 'master' into smarter_install
a7c9575 fix bug where $XDG_DATA_HOME is not set properly when switching between users via su
cdc171b Merge branch 'master' of github.com:joelthelion/autojump
2a3fbd4 change default line to add to .bashrc/.zshrc message
d4e5895 add default installation location depending on user id (globally for root, otherwise local)
bbe54c3 install type is determined by /bin/zsh env var
6d1a9ff Add vim and emacs to the list of completed programs
448696e fix conditional where tilde (~) was not properly expanding to user's home directory
23ecda6 Merge branch 'changelog'
3af3322 add changelog with v18, v19 details
1d2f3be change brew test conditional to not throw errors on non-homebrew systems
76f4c7d tweak mac installation instructions
9a5f101 update readme documentation
8f88304 add changelog template
2bc5be6 Merge pull request #109 from shelhamer/homebrew_zsh
394c67c Add fpath update for homebrew installs

git-subtree-dir: .zsh.d/external/autojump
git-subtree-split: a17d904e163cf3ae8d1a5d3b40d8ca563a65eb3e
Updated ec2-api-tools
Merge branch 'master' into os_x

* master:
  Updated ec2-api-tools
  Squashed '.zsh.d/external/autojump/' changes from a74ef31..a17d904
Don't install zeevex-compat versions of gems.
Set git's push.default to upstream.
Don't spawn new windows with emacsclient.
Use brew --prefix to compute aws tool home paths.
Added zsh-users/zsh-completions as a subtree
Squashed '.zsh.d/external/zsh-completions/' content from commit d560a7f

git-subtree-dir: .zsh.d/external/zsh-completions
git-subtree-split: d560a7f53341a6ef08425c5bfb3e244db65a2292
Clean up FPATH. Eschew local completions.
hub startup script, overrides git command.
Updated personal Gemfile.lock.
Added global ~/.gitingore_global.
Merge branch 'master' into os_x

* master:
  Added global ~/.gitingore_global.
  Updated personal Gemfile.lock.
  hub startup script, overrides git command.
  Clean up FPATH. Eschew local completions.
  Squashed '.zsh.d/external/zsh-completions/' content from commit d560a7f
  Use brew --prefix to compute aws tool home paths.
  Don't spawn new windows with emacsclient.
  Set git's push.default to upstream.
  Don't install zeevex-compat versions of gems.
Don't set JAVA_HOME under Darwin.
Squashed '.zsh.d/external/autojump/' changes from a17d904..e62e720

e62e720 move config back to global space
7123e23 minor version bump to v20-6
57053a7 Add dev section to README.md and update makefile to reflect new section.
f25d7ba add unit tests, run using: make test
13e385a reformat doc strings, move config into own function, add global variable for testing purposes
79e644b Add name(s) to AUTHORS
009b01d tweak docs regarding minimum requirements
e811818 tweak documentation wording
0818bf8 Fix #110, autojump_ignore_case now working properly
83e01c5 tweak mailing list wording
effe349 Add Google Group information to documentation
08a79c1 Add the google group to the README
60a9c1c add purge option to clear database of missing entries
a4cbff7 add copyright back into main file
be82be3 fix env var settings
9ad889a To prevent database decay, set the env var AUTOJUMP_KEEP_ALL_ENTRIES=1 instead of using --preserve or --competion
7882550 Implements #110: use 'export AUTOJUMP_IGNORE_CASE=1' to make autojump case insensitive
d7cea40 implement basic fuzzy search
f98b136 increment path weights on a log scale
900e388 bump stored paths
6a16a7e update shell scripts to use new tab completion argument --complete, update docs with new --preserve option
ad10e13 minor refactoring
73d18ee minor reorganization
a96d1bc minor reorganization tweaks
7343ef1 move match last pattern into separate funciton and disabled
31001c9 Move argument parsing into function, fix database class items, add preserve option
46b8d84 Move database logic into database object
da3d660 Remove license from individual files, consolidate information into AUTHORS and LICENSE
9ee7906 fix documentation formatting
f91c7e3 split up doc building for manpage and readme.md
168865f fix install.sh to reflect new locations, tweak documentation where necessary
acfc5c1 restructure files, working make doc and make release
2ebcdba reformat changelog
0d421dc Remove unicode string parsing in argument handling
8decc17 Update documentation and install scripts to reflect new minimum Python requirements.
99f0d76 Documentation update provides Mac Ports command for install.
3a767d1 remove leftover syntax when docs were in ReST format
1c7b930 Macports command instead of link to Portfile
9e2a28e ran make_doc.sh
e23f4a0 update documentation with known issues (i.e. long standing bugs)
2cfd91b Modify documentation to notify that minimum Python version is 2.7 instead of 2.6.
f5132bb version numbering
cd126da minor documentation update in preparation for release-v20
2c2875f Update documentation, particularly how to prefer symbolic links or change directory weights within the database.
efa8bbc Fixes #112, fixes #116. Simplify documentation build.
079abfd Fix default autojump behavior when run with 0 arguments.
25d1b9c Fixes #113, #115, refactor autojump to use argparse over optparse.
9147d6c First version of argparse implemented
c91843c #114: Error message when directory does not exist or not in autojump database.
465ca79 Fixes #114: autojump suppresses the error message caused by 'j --help'.

git-subtree-dir: .zsh.d/external/autojump
git-subtree-split: e62e72076532243ed1cb7bf0751ba9e61fc9613a
Merge commit '476273e369f26b66649e22a71338c7f833ffb763'

* commit '476273e369f26b66649e22a71338c7f833ffb763':
  Squashed '.zsh.d/external/autojump/' changes from a17d904..e62e720
fixed up autojump.zsh symlink
Squashed '.zsh.d/external/zsh-completions/' changes from d560a7f..3497b48

3497b48 Remove _task, already provided by taskwarrior project

git-subtree-dir: .zsh.d/external/zsh-completions
git-subtree-split: 3497b4841cb961e7db04e2a3bfe69b2dbec66427