* option to have apache2 as front end

* still on g-1 (swift/keystone compatibility issues)

update merge conflicts from #61