Combined pythonista and edit modules into edit

Combined pythonista an edit. #33