Change theme and some other stuff
Merge branch 'master' of github.com:jvanbaarsen/dotfiles

Conflicts:
	aliases