Bunch o' changes; big one is inclusion of el-get. Also added jedi