Renamed templates/settings/10server.conf to templates/settings/generic.conf since it is used for a lot more than just the 10server.conf and it's very generic (not specific to the 10server.conf at all).
core/server.py:  Changed the call to `sys.uname().sysname` to be `sys.uname()[0]` for backwards compatibility with Python 2 (apparently only Python 3 has that .sysname attribute).
core/configuration.py:  Updated to reflect the new generic.conf file.
core/configuration.py:  Added 'combine_js', 'combine_css', and 'combine_css_container' to the list of `non_options` so these CLI-only options don't end up in the 10server.conf when it gets generated automatically (e.g. when Gate One is run the first time).
terminal/plugins/bookmarks.py:  Added some @require(authenticated()) decorators.  Mostly to prevent odd exception messages from showing up in the logs when the cookie_secret is changed.
terminal/app_terminal.py:  `TerminalApplication.terminals()` now requires the user be authenticated.  For the same reason as the change to bookmarks.py.