changes to match up with the moar_dsl refactor
update to angelo-0.3.0