Update travis and tox files
Add edit command
Merge branch 'edit' into dev