Updated plugins
Added vim-flake8
Added vim-powerline
Update plugins vim/bundle/kien-ctrlp and vim/bundle/tpope-vim-fugitive
Updated vim/bundle/Shougo-neocomplcache vim/bundle/kien-ctrlp vim/bundle/majutsushi-tagbar vim/bundle/raimondi-delimitMate vim/bundle/scrooloose-syntastic vim/bundle/sjbach-lusty
vim-puppet
Added vim-chef
Updated vim/bundle/Shougo-neocomplcache vim/bundle/majutsushi-tagbar vim/bundle/tpope-vim-fugitive
Updated vim/bundle/AndrewRadev-splitjoin vim/bundle/Shougo-neocomplcache
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Remove semicolon mapping; semicolon is used to repeat last find command
  Add support for ~/.vimrc.after
  Replace showmarks due to deleted repo by @garbas [Close #39]
  Upgraded syntastic; Removed javaScriptLint plugin - replaced with syntastic
  Less Colors for Man Pages

Conflicts:
	.gitmodules
	vim/bundle/kien-tabman
fix conlficts
Removed VimEz-ShowMarks
Added VimEz-ShowMarks removed garbas-vim-showmarks
vim/bundle/kien-ctrlp vim/bundle/tpope-vim-git
Updated vim/bundle/Shougo-neocomplcache
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Updated README with keymap debugging info
  Upgraded ctrlp
  Upgrdae fugitive and solarized
  Added ,gf - go to file in vertical split
  Better colors for manpage search as suggested by @irrationalfab
Updated vim/bundle/Shougo-neocomplcache vim/bundle/tpope-vim-unimpaired vim/bundle/vim-scripts-AutoTag vim/bundle/wavded-vim-stylus
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Added + and - for resizing vertical windows
  Replaced vim-rspec with vim-ruby-conque bindings
  Removed unused file
  Tweaks to skwp powerline theme
  Integrate vim-powerline with custom skwp theme
  Fix 'git l' (aliased to 'gl')  mapping which was not working
  Update all plugins

Conflicts:
	vim/bundle/skwp-vim-rspec
Removed Lokaltog-vim-powerline
Removed Lokaltog-vim-powerline