Refactored bookmarks to use option parser, allow bookmarking rooms with passwords
Merge branch 'master' into resize