more cleanup
Merge branch 'master' of github.com:svexican/etc

Conflicts:
	zsh/profile