Make the "End conversation" actually work
Merge branch 'Dev' of github.com:jcalvinowens/keychat into Dev