Convert over to nubis_apache
Convert over to nubis_apache

(apache is still included, but comes from nubis_apache)

Fixes #604

Nubisproject/nubis-base,limed/nubis-base,tinnightcap/nubis-base,tinnightcap/nubis-base,limed/nubis-base,gozer/nubis-base,gozer/nubis-base,tinnightcap/nubis-base,gozer/nubis-base,Nubisproject/nubis-base,limed/nubis-base