Add linux specific settings
Merge branch 'master' of github.com:kmizu/dotfiles

Conflicts:
	.zshrc