local changes for work pc
Merge branch 'master' of github.com:ermagana/dotfiles

Conflicts:
	.gitignore
Made my colorscheme dependent on the OS