Added some shit, moved some other shit
Merge branch 'master' of github.com:xj9/usr

Conflicts:
	bin/htmlcompressor
	bin/minify
	bin/ssh-copy-id
	bin/ssh-copy-id.sh
	etc/ssh_config
	etc/zshrc
	local/bin/ssh-copy-id.sh