Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Readme cleanup
  Removed unused / not working ,,f ,,F aliases
  Add gitgutter
Renamed vim/plugion/settings/fugitive.git to vim/plugin/settings/fugitive.vim. Fixes issue #249
Removed unused plugin ruby_focused_unit_test
Merge pull request #250 from kmees/issue_249

Renamed vim/plugion/settings/fugitive.git to vim/plugin/settings/fugitiv...
Updated subprojects
Added ,mm to switch to mailer while in view
Revert "Added ,mm to switch to mailer while in view"

Conflicted with showmarks in an ugly way
This reverts commit 44a2cd79d09aea86c464d4880d5fdfe8b378d7ce.
Add solarized themes for iTerm2

Both solarized dark and light are now included in the subdir
iTerm2. They are copies from the original repo because it doesn't
seem worth to clone a ~10Mb repo just to keep in sync 2 files,
considering that solarized hasn't changed much in the past years.

The rakefile has been updated to trigger the automatic installation
of these two themes only if OS == OSX. The user will still have
to set the themes for his/her current profile manually (but that's
explained at the end of the installation process).
Merge pull request #259 from duhanebel/iterm_solarized

Add solarized themes for iTerm2
Fix a bug that was causing rake to overwrite SHELL settings

The prezto install procedure now checks to make sure the user
doesn't have an alternative version of zsh installed before changing
the current shell preference with "chsh".
This may be the case when an user is already using zsh but on a
different version from the one shipped with OS X

Fixes #264
Merge pull request #265 from duhanebel/zsh_install_check

Fix a bug that was causing rake to overwrite SHELL settings
Fix a bug that's causing the installer to overwrite backup files

When rake install/update is run for the second time, any .backup
file created by the first run it's going to be overwritten by
the new symlink even if the current file is the same as the one
we are going to write.

The rakefile now checks if the symlink we are going to create
points to the same target as the one already there and if that's
the case, doesn't overwrite any backup.
fixes #268
Merge pull request #268 from chadkouse/env_shell

"uninitialized constant SHELL" in zsh install step
Merge pull request #266 from duhanebel/install_link_fix

Fix a bug that's causing the installer to overwrite backup files
New: [VIM] added file-line plugin. Allows to open file and move to certain line like this vim Rakefile:110
Merge pull request #269 from petRUShka/master

Add vim-plugin for opening files like this `vim Rakefile:110`
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  New: [VIM] added file-line plugin. Allows to open file and move to certain line like this vim Rakefile:110
  fixes #268
  Fix a bug that's causing the installer to overwrite backup files
  Fix a bug that was causing rake to overwrite SHELL settings
  Add solarized themes for iTerm2
  Revert "Added ,mm to switch to mailer while in view"
  Added ,mm to switch to mailer while in view
  Updated subprojects
  Removed unused plugin ruby_focused_unit_test
  Renamed vim/plugion/settings/fugitive.git to vim/plugin/settings/fugitive.vim. Fixes issue #249
Merge branch 'master' into customizations

* master:
  New: [VIM] added file-line plugin. Allows to open file and move to certain line like this vim Rakefile:110
  fixes #268
  Fix a bug that's causing the installer to overwrite backup files
  Fix a bug that was causing rake to overwrite SHELL settings
  Add solarized themes for iTerm2
  Revert "Added ,mm to switch to mailer while in view"
  Added ,mm to switch to mailer while in view
  Updated subprojects
  Removed unused plugin ruby_focused_unit_test
  Renamed vim/plugion/settings/fugitive.git to vim/plugin/settings/fugitive.vim. Fixes issue #249