Added base16 theme. Moved colorthemes to the vundle package system
Added base16 theme support
Merge branch 'master' of https://github.com/iemejia/dotfiles

Conflicts:
	.emacs.d/init.el
Merge branch 'master' of https://github.com/iemejia/dotfiles
Merge branch 'master' of https://github.com/iemejia/dotfiles
[vim] configured airline
Merge branch 'master' of https://github.com/iemejia/dotfiles
Merge branch 'master' of https://github.com/iemejia/dotfiles
Merge branch 'master' of https://github.com/iemejia/dotfiles
Merge branch 'master' of https://github.com/iemejia/dotfiles
[vim] returned to airline for compatibility with other machines
(-python)
Merge branch 'master' of https://github.com/iemejia/dotfiles
[vim] commented powerline config to avoid warning message
Merge branch 'master' of https://github.com/iemejia/dotfiles

Conflicts:
	.vimrc
[vim] fixing compatibility issues
[zsh] adding plugins
Merge branch 'master' of https://github.com/iemejia/dotfiles

Conflicts:
	.vimrc