Removed solarized from terminal (set in vimrc_specific if it's needed)
Merge branch 'master' of github.com:xen-0/personal-vimrc

Conflicts:
	vimrc
fixup
Get rid of annoying error bells