Update ctrlp.vim
Removed bundle kogakure/vim-sparkup.git since the repo doesn't exist on github anymore
Merge pull request #390 from jby/fix_vim-sparkup

Removed bundle kogakure/vim-sparkup.git
Merge pull request #387 from maletor/patch-2

Update ctrlp.vim
Git snapshot: take a snapshot and stash it without messing with your working tree
git recent-branches - tell me what i worked on recently
Update README.md
Move vim settings out of plugins to ensure they all get correctly loaded after everything else [Fix #373]
Silence vim-session dialogs
Removed sparkup from readme [Fix #403]
Add puppet module
Fix gitconfig colors causing iTerm with solarized to show diffs incorrectly
Changed reference to prezto master
Go back to using skwp prompt for rvm-prompt integration
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Go back to using skwp prompt for rvm-prompt integration
  Changed reference to prezto master
  Fix gitconfig colors causing iTerm with solarized to show diffs incorrectly
  Add puppet module
  Removed sparkup from readme [Fix #403]
  Silence vim-session dialogs
  Move vim settings out of plugins to ensure they all get correctly loaded after everything else [Fix #373]
  Update README.md
  git recent-branches - tell me what i worked on recently
  Git snapshot: take a snapshot and stash it without messing with your working tree
  Removed bundle kogakure/vim-sparkup.git since the repo doesn't exist on github anymore
  Update ctrlp.vim

Conflicts:
	git/gitconfig