- removed upstreamed branch
Merge branch 'master' of git://github.com/aliceinwire/overlay

Conflicts:
	dev-python/pip/metadata.xml
Merge branch 'master' of git://github.com/aliceinwire/overlay
- removed old ebuild