Merge branch 'master' into linux

Conflicts:
	.zshrc
Merge branch 'linux' of https://github.com/mkc188/zshrc into linux