Improve portability
Merge branch 'master' of github.com:mukaibot/DotFiles

Conflicts:
	zshrc
Remove some old crap