Added solarized stuff and more
Merge branch 'master' of github.com:ErikBjare/dotfiles

Conflicts:
	.gitmodules