Solarized theme
Merge branch 'master' of github.com:lppl/vim-configuration

Conflicts:
	.vimrc