Merge https://github.com/hnaparst/overlay

Conflicts:
	net-misc/bitmask_client/bitmask_client-0.6.1.ebuild