Make ls/ll aliases linux friendly

(cherry picked from commit ca5cc939a19765cb63decc95ca4e42b9316861e9)
remove outdated git option

(cherry picked from commit 11ee42c0babf38d276b52aa9aa7fee770afa726a)
Update gitignore vim settings

Pulling in updates from Github's global vim gitignore file:  https://github.com/github/gitignore/blob/master/Global/vim.gitignore
(cherry picked from commit c25cc91b6f88885c06d749507f500a5162f5cf8e)
status bar shows even on one pane [Fix #538]

(cherry picked from commit 491bdf7a6431f456a2254e5a7d74720479781be7)

Conflicts:
	vim/settings/lightline.vim
Merge pull request #547 from tmullen/update_homebrew_path

Update to Homebrew app install path.
(cherry picked from commit f8727bfaa7f376a495cbbd7538de5b93e03af10d)
Merge pull request #546 from jeffwidman/patch-2

Remove deprecations from gemrc
(cherry picked from commit 7c3bc67fe14984025dededb83db55756ef52fdcc)
Remove vim/.bundles.local.bak from source control

(cherry picked from commit d63c94dda7fe70ba54fa26693d548fdd01e7a81b)

Conflicts:
	.gitignore
Merge remote-tracking branch 'origin/master'

* origin/master:
  Updating NeoBundle new initialization methods
  Updating new repo for multiple cursors
  Trying to pinpoint merge problems
  We use git. No need for backup files
  Adding git rename aliases
  Adding brewu and cls aliases to zsh
  Not ignoring 'tags' folder as it's common to happen
  Removing github issues
  Better shell installation