Merge remote branch 'upstream/master'

Conflicts:
	emacs.d/init.el
fix tmux configs for zsh
my zsh theme
vim folder
Ignore emacs tmp files
Selecta config
Colorful mutiline prompt
Clojure and python emacs modes
ansible-yaml module
vim airline plugin
nerdcommenter plugin
VIM Surround module
Merge branch 'master' of github.com:pfeff/dotfiles

Conflicts:
	.gitignore
	.gitmodules
	vim/autoload/pathogen.vim