begin editable, sortable
merge conflicts resolved playlist index and show
Merge branch 'master' of github.com:dshamis317/valence