setting up zenburn and solarized
Merge branch 'master' of github.com:verdammelt/dotfiles

Conflicts:
	.emacs.d/init.el
	.vim/vundle.vim