Merge in maguro setup since it works and is now in repo manifest