Fix edit sidebar
Worked towards fixing #891 but has some bugs still
removed deleted file
Merge branch 'sidebar-sortable' of github.com:tojrobinson/Mailpile into tojrobinson-sidebar-sortable
Merge branch 'tojrobinson-sidebar-sortable'