Empty secure trash empty and remove option to disable Chrome swiping.

(cherry picked from commit 3a69d6740d66134002614c09b6d66e67a5fe327a)
Change git mergetool to non-gvim Fugitive and add osxkeychain credential helper.

(cherry picked from commit e490fdc97fd5a9f5e2fcb478d21dbab261586c21)
Shift all window indicies one to the left when closing a window in tmux rather than having gaps such that a new window is always appended to the end; stop tmux from renaming window titles.

(cherry picked from commit 975190ac73384d0487e8bae8b547061a2d406a36)
Added support for golang via fatih/vim-go and added necessary Mercurial dependency to install script.
Made tab characters a little more visually pleasing (specifically for Golang) by altering listchars. Also added a convenient shortcut for toggling whether or not listchars are displayed.
Export the necessary environment variables for Golang (particularly $GOROOT which is dynamic and, for some of the tooling and/or documentation to work properly, needs to be set).
A bunch of golang-specific appearance enhancements. Installed the molokai theme that gets used in golang buffers because solarized doesn't look great (IMO). The solarized lightline theme looked goofy with molokai, so I restored that to the default. And a few very specific modifications here and there to prevent artifacting or extra buffers from being spawned.
Remove all traces of NERDTree in favor of the native netrw.
After wasting some time customizing netrw, ended up finding tpope's vinegar plugin that I liked a lot better (smoothes out some of the rough edges with netrw).
Merge remote-tracking branch 'upstream/master' into merge-upstream

* upstream/master:
  Remove orphan vim settings for LustyExplorer plugin
  Fixed tmux.conf syntax
  Fix solarized easymotion in terminal vim
  Moving ./osx to ./bin/osx
  Adding shell script to fix MacVim bug with external displays
  Update aliases.zsh
  Make tmux split exactly 50%
  Update vim enhancements README with Lightline
  Modified setings of lightline to match the README in the lightline project Added indication of paste mode, added functions instead of code in call of components, added git branch glyph, added path to file being edited