Merge pull request #186 from scrollback/smallfixes

Remove room name from general settings
Merge branch 'master' into smallfixes