Merge branch 'master' of github.com:heyLu/confidence

Conflicts:
	.vimrc

.vimrc

@@ -6,8 +6,10 @@ if isdirectory($HOME . '/.vim/bundle/vundle')
	call vundle#rc()
	Bundle 'gmarik/vundle'
	Bundle 'Valloric/YouCompleteMe'
	let g:ycm_confirm_extra_conf = 0
	if has('python')
		Bundle 'Valloric/YouCompleteMe'
		let g:ycm_confirm_extra_conf = 0
	endif
	Bundle 'Lokaltog/vim-easymotion'
	"Bundle 'laurilehmijoki/haskellmode-vim'
	"au BufNewFile,BufRead *.hs compiler ghc

.zshrc

@@ -32,7 +32,7 @@ function precmd {
	user="%{$fg[red]%}%n%{$reset_color%}"
	dir="%{$fg[cyan]%}%~%{$reset_color%}"
	lastcmd="$history[$(($HISTCMD-1))]"
	lastcmd_witherror="%(?.$lastcmd.%S$lastcmd%s)"
	lastcmd_witherror="%(?.$lastcmd.%B$lastcmd%b)"
	PROMPT="$user in $dir@$(repo_branch) $lastcmd_witherror
$(repo_char) $ "
	RPROMPT="%D{%Y-%m-%d} %{$fg[red]%}%t%{$reset_color%}"