more changes - not yet working
Merge branch 'master' of github.com:jcalvinowens/keychat