Update vimrc with new theme and todo fix
Merge branch 'master' of github.com:andreisebastianc/vimrc

Conflicts:
	.vimrc