Squashed '.zsh/oh-my-zsh/' changes from 7f07fac..43aa378

43aa378 Merge pull request #2448 from gawashburn/master
5acfdf5 Merge pull request #2871 from wrboyce/extract-pigz
4610add Merge pull request #3092 from MWers/aws-brew-issue
4c4f47a Merge pull request #3265 from thii/fix-yosemite-broken
60a41a8 Merge pull request #3283 from jaapz/master
9f4dfc0 Merge pull request #3309 from jarinudom/superjarin
db8eacf use pigz if available in extract plugin
b6b1dd3 Fix Yosemite broken zsh where $PATH var does not get appended correctly.
0222e77 Merge pull request #3333 from mcornella/fix-git-hide-dirty
6a496d2 Merge pull request #3323 from alfss/fix-pj
a301f56 Switch back to oh-my-zsh.hide-dirty setting again
0c04470 [~] fix plugin pj
923d2c8 Fix autojump script to support Nix installations
d0f3fb3 Merge simplified superjarin theme
df5b09e Merge pull request #3299 from apoxa/fix-profiles
1125333 Fixes the profiles-plugin
7f75bb9 Merge pull request #3223 from mcornella/use-special-vars
95d795e Change all hostname calls for $HOST or $SHORT_HOST
4310a15 Change all pwd calls for $PWD variable
74177c5 Change all whoami calls for $USER variable
7034b01 Merge pull request #3213 from nikhgupta/features/fix-emoji-clock
8a51bfd Merge pull request #3108 from mfaerevaag/master
35f1a23 Merge pull request #3131 from halilim/remove-j-alias
510055a Merge pull request #3081 from pavoljuhas/master
6118446 Merge pull request #2974 from elliottwilliams/patch-1
e423ca0 Merge pull request #2976 from shammellee/patch-1
57ff83d Merge pull request #2946 from moinakg/master
0f7e5e4 Merge branch 'simonbuchan-master'
81004df 2928 merge conflict
1b65c55 Merge pull request #2959 from crkochan/fix_rake_command
4eff792 Merge pull request #2648 from dfarrell07/master
160abc9 Merge pull request #2323 from michaelorr/slow-git-fix
2984d2d Merge pull request #2168 from riyad/modernize-virtualenv
ed01122 Merge pull request #1604 from franklouwers/master
548b9c4 Merge pull request #3224 from Neal/xcode-simulator-fix
ba6bf24 Merge pull request #3230 from willmendesneto/fix-compass-doc-search
c0905fd Merge pull request #3226 from mcornella/fix-plugin-gitignore
eae7005 Added VIRTUAL_ENV_DISABLE_PROMPT to steeef.zsh-theme
b6012bc Update to the upstream smart-change-directory.
071de5f Make the simulator alias work with older Xcode versions as well.
b452caf Follow-redirect and silent mode curl throughout gitignore
04d1428 Fix gitignore curl, should follow redirects
69a0b28 Fix misspellings in gitignore plugin
b9a11b1 fixed URL on github.io
9f801ff [wd] fix space in path
6f1eb08 Fix error using compass search alias
d794a50 Update path for the iOS simulator.
71ee0d7 added support for GNU version of `date`
3a39732 Change to epoch target in days instead of seconds.
90762ee Convert epoch_target from days to seconds.
5f38a53 Update Solaris changes to use OSTYPE and zsh datetime  module.
7a5d68c Remove j alias for autojump
b509385 [wd] Minor bug fix in show command
6855dd4 [wd] New minor version (v0.4)
87fb118 Changed brew cmd to properly report if awscli is installed via homebrew
0e00f0b typo
73212de Fix osx function: "not valid in this context"
bf134e9 Fix for recusion limit hit for _rake_command alias
5e328e3 Solaris portability tweaks.
2927ce3 Fix POST_1_7_2_GIT check for parse_git_dirty submodules.
676fb4e Fix parse_git_dirty() when status.branch is set.
bce7497 drop the foreach, make it even shorter. thanks Marc Cornellà!
b2ce306 Simplified gallois RPS1 setup using some helpful scripts
3976b93 Fixed which output at each new shell creation
9b811fb accidentally blew away a git config setting used for another purpose, renaming in order to distinguish
d608fbf Make the virtualenv plugin themable
df67f2e [pj-plugin] avoid using basename. migth be (a lot?) faster
9674a96 [pj-plugin] delete ugly ls -l | awk print $9 thing to use something not depending on date format + add support for projects with spaces in them

git-subtree-dir: .zsh/oh-my-zsh
git-subtree-split: 43aa3783f8a5606e0f884a43d51daf36553af1e4
Merge commit '2d52083f87b86c5a07943735c0c18f34d8d39385'
Squashed '.vim/bundle/vim-pathogen/' changes from 91e6378..b9fb0df

b9fb0df Drop obsolete caveat about {}

git-subtree-dir: .vim/bundle/vim-pathogen
git-subtree-split: b9fb0dfd811004010f5f6903edef42d6004ebea2
Merge commit '6e892065138a82740cba2e5e067ab647e84caa55'
Squashed '.vim/bundle/vim-fugitive/' changes from 0374322..2c8461d

2c8461d Use `<nomodeline>` with Fugitive autocmds, and un-silent them
d3b98d9 Make configured_tree a caching global function
5699f46 Fix instaweb support

git-subtree-dir: .vim/bundle/vim-fugitive
git-subtree-split: 2c8461db084d205903a792a23163faa546f143c9
Merge commit '249e0135704aef65ca21b44ba75c82b47fa3023b'
Squashed '.vim/bundle/vim-sensible/' changes from 64aa12b..b30dcf3

b30dcf3 Delete comment char when joining commented lines

git-subtree-dir: .vim/bundle/vim-sensible
git-subtree-split: b30dcf387af977acfa21732592bfca05598b2188
Merge commit '5d6624c5fca31ed1930a97e2d22a9750e4e50e3c'
Squashed '.vim/bundle/tagbar/' changes from 5d1ae68..f9c5f24

f9c5f24 Don't skip over closed folds with zk
a084e47 Rephrase compatible programs a bit
df09799 Add mappings for moving through folds, closes #224
f933907 Add option to arrange Tagbar window vertically
5283bc8 Reprocess files if filetype changes, closes #228

git-subtree-dir: .vim/bundle/tagbar
git-subtree-split: f9c5f24576e82aae5ab8a5480f1ae48615354e40
Merge commit '74a8fd8a7a6ee07b030050b8998b31351d7bb44d'
Squashed '.vim/bundle/bufexplorer/' changes from e5645d6..f3bbe12

f3bbe12 Converted files to Unix format.

git-subtree-dir: .vim/bundle/bufexplorer
git-subtree-split: f3bbe12664b08038912faac586f6c0b5104325c3
Merge commit '373a6b9dee681eed8ee0de69c84b7fc901684b3b'
Squashed '.gdb/peda/' changes from 1b34526..f2d50d5

f2d50d5 Merge pull request #1 from borski/patch-2
0dbfcca Typo.
d94a0d7 Update README.md

git-subtree-dir: .gdb/peda
git-subtree-split: f2d50d53d8172f4ff6003def0d5c13b1339fda9f
Merge commit '5e61a534dcc5533f14d9ecaf21791f24c42a52a3'