merge with pythonstack

Signed-off-by: Matthew Thode <mthode@mthode.org>