Enable tmux to send-prefix using C-a a

* It's useful when you have a tmux session into another tmux session
  (ie. via ssh).
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 pull request #402 from imobach/master

Enable tmux to send-prefix using C-a a
Added syntax highlightning for tmux.conf
Spring rspec alias
Make :Gsesarch way faster - requires to :BundleUpdate to get latest skwp/greplace.vim
test presence of persistent_undo module before use it. (prevent error msg for versions<703)
just a spelling mistake in comment
Merge pull request #406 from jeremyclement/master

Resolve error "E518: Unknown option: undofile" for vim < 7.3
Merge pull request #405 from jby/add_tmux_vim_syntax

Added syntax highlightning for tmux.conf
Merge remote-tracking branch 'skwp/master'

* skwp/master:
  just a spelling mistake in comment
  test presence of persistent_undo module before use it. (prevent error msg for versions<703)
  Make :Gsesarch way faster - requires to :BundleUpdate to get latest skwp/greplace.vim
  Spring rspec alias
  Added syntax highlightning for tmux.conf
  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
  Enable tmux to send-prefix using C-a a

Conflicts:
	tmux/tmux.conf
	zsh/theme.zsh