Updated with elpy mode and removed some old crud.