ampache-doped merged back into ampache. yay!