Updating fork to remove zf2-forms dependencies