Add hwloc, prepare for bottling