make it possible to deactive proxy
Merge branch 'proxy-config' into gentoo
add proxy stuff to gentoo template
Merge branch 'gentoo' into rabe