Merge branch 'sebix-master'

Conflicts:
	hosts.mine
	update-hosts.sh
add hosts.private to gitignore