Merged in some MacVim settings from my old .gvimrc
Merged in some settings from my old .vimrc
Removed unnecessary macvim config
Fixing whitespace
Merge branch 'master' of git://github.com/mutewinter/dot_vim

# By Jeremy Mack (67) and Julien Stechele (1)
# Via Jeremy Mack
* 'master' of git://github.com/mutewinter/dot_vim: (68 commits)
  Trying MatchTagAlways and YouCompleteMe
  Updated existing plugin descriptions
  Default to linking vim files
  Change to splits when opening them
  Removed unused save binding
  Fixed up some comments
  @ doesn't actually work and you should escape the dollar
  Sometimes I'm lazy with shift
  Easier installation
  Copy that gist
  Adds hyphenated words as full words
  NO WHITE SPACE
  Let's just try jk
  Added gist-vim for GitHub Gists
  Added vroom and cucumber for Rails testing
  Added HelpClose for closing help windows
  Added config for Unconditional Paste
  Keep audio bell from sounding in gvim
  CtrlP wins.
  Support <enter> in QuickFix list
  ...

Conflicts:
	Rakefile
	vimrc
Removed bindings for non-existent plugin
Removed duplicate binding
I prefer 4 columns per tab
Added java and groovy files to automatically strip trailing whitespace
New bindings for formatting json and changing the PWD based off the open file.
Adding some more file extensions that should have trailing whitespace trimmed
Changed the json format binding to jf
Autoloading nerdtree in Macvim
Adding search and replace binding
Attempting to disable Ruby balloons since they just cause lag
Expanded nerd tree size and added custom conf for Sytanstic and JSL
Fix for clipboard when running vim in tmux.  Conforming to 2 space indentation since most projects seem to be using it.
Add support for freemarker syntax, local .vimrc files, and autocomplete for some JS libraries
Merge remote-tracking branch 'upstream/master'

* upstream/master: (25 commits)
  plug: Replaces keepcase.vim with vim-abolish
  plug: Adds visual star search
  ='s underline as well
  That's a silly comment
  Oh silly mac
  Updates readme plugins text
  Switches back to upstream vim-markdown
  Adds check for persistent_undo capability
  Config for vim-signify to fix mapping clashes
  Now collecting identifiers from strings in YCM
  Updated plugin list
  Changed to vim-signify for Git diffs in gutter
  Better pneumonic
  Disables SCSS in Syntastic because it's slooooowwww
  Added MIT License
  Way smoother vundle install notes
  Enter was horrible for completion
  Switched back to upstream vim-indent-guides
  YouCompleteMe custom config
  Switched to Ag.vim over Ack.vim
  ...
Remove redundant JSON format binding after latest merge from upstream.