diff --git a/.gitignore b/.gitignore
index 99f91b0..dc8d18f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,4 @@ nosetests.xml
 SITE/cache/
 SITE/output/
 SITE/.doit.db
+SITE/comet.log
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..e44d1db
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,23 @@
+Copyright © 2014-2015 Chris Warrick, Roberto Alsina et al.
+
+Permission is hereby granted, free of charge, to any
+person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the
+Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the
+Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions of
+the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
+OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..0045c3b
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,3 @@
+graft comet
+include README.rst LICENSE CHANGELOG.rst setup.py setup.cfg setup_virtualenv.sh requirements.txt
+global-exclude __pycache__ *.pyc
diff --git a/SITE/comet.log b/SITE/comet.log
deleted file mode 100644
index eed5b39..0000000
--- a/SITE/comet.log
+++ /dev/null
@@ -1,147 +0,0 @@
-[2015-01-10T14:34:12Z] INFO: Comet: COMET CMS running @ http://localhost:8001/
-[2015-01-10T14:34:13Z] INFO: Comet: COMET CMS running @ http://localhost:8001/
-[2015-01-10T14:34:13Z] CometHTTP [200] 127.0.0.1 GET http://localhost:8001/ <index>
-[2015-01-10T14:37:38Z] INFO: Comet: COMET CMS running @ http://localhost:8001/
-[2015-01-10T14:37:39Z] INFO: Comet: COMET CMS running @ http://localhost:8001/
-[2015-01-10T14:38:01Z] INFO: Comet: COMET CMS running @ http://localhost:8001/
-[2015-01-10T14:38:02Z] INFO: Comet: COMET CMS running @ http://localhost:8001/
-[2015-01-10T14:38:03Z] INFO: Comet: COMET CMS running @ http://localhost:8001/
-[2015-01-10T14:38:48Z] INFO: Comet: COMET CMS running @ http://localhost:8001/
-[2015-01-10T14:38:49Z] INFO: Comet: COMET CMS running @ http://localhost:8001/
-[2015-01-10T14:38:52Z] CometHTTP [200] 127.0.0.1 GET http://localhost:8001/ <index>
-[2015-01-10T14:38:57Z] CometHTTP [200] 127.0.0.1 GET http://localhost:8001/ <index>
-[2015-01-10T14:44:10Z] INFO: Comet: COMET CMS running @ http://localhost:8001/
-[2015-01-10T14:44:53Z] INFO: Comet: COMET CMS running @ http://localhost:8001/
-[2015-01-10T14:45:03Z] INFO: Comet: COMET CMS running @ http://localhost:8001/
-[2015-01-10T14:45:12Z] CometHTTP [200] 127.0.0.1 GET http://localhost:8001/ <index>
-[2015-01-10T14:45:12Z] CometHTTP [304] 127.0.0.1 GET http://localhost:8001/assets/css/all-nocdn.css <serve_assets>
-[2015-01-10T14:45:12Z] CometHTTP [304] 127.0.0.1 GET http://localhost:8001/comet_assets/css/comet.css <serve_comet_assets>
-[2015-01-10T14:45:12Z] CometHTTP [304] 127.0.0.1 GET http://localhost:8001/assets/js/all-nocdn.js <serve_assets>
-[2015-01-10T14:45:12Z] CometHTTP [304] 127.0.0.1 GET http://localhost:8001/comet_assets/js/comet.js <serve_comet_assets>
-[2015-01-10T14:45:27Z] CometHTTP [200] 127.0.0.1 GET http://localhost:8001/assets/css/all-nocdn.css <serve_assets>
-[2015-01-10T14:45:31Z] CometHTTP [200] 127.0.0.1 GET http://localhost:8001/assets/css/all-nocdn.css <serve_assets>
-[2015-01-10T14:45:38Z] CometHTTP [200] 127.0.0.1 GET http://localhost:8001/comet_assets/js/comet.js <serve_comet_assets>
-[2015-01-10T14:47:42Z] INFO: Comet: COMET CMS running @ http://localhost:8001/
-[2015-01-10T14:47:43Z] CometHTTP [200] 127.0.0.1 GET http://localhost:8001/ <index>
-[2015-01-10T14:47:43Z] CometHTTP [304] 127.0.0.1 GET http://localhost:8001/assets/css/all-nocdn.css <serve_assets>
-[2015-01-10T14:47:43Z] CometHTTP [304] 127.0.0.1 GET http://localhost:8001/comet_assets/css/comet.css <serve_comet_assets>
-[2015-01-10T14:47:43Z] CometHTTP [304] 127.0.0.1 GET http://localhost:8001/assets/js/all-nocdn.js <serve_assets>
-[2015-01-10T14:47:43Z] CometHTTP [304] 127.0.0.1 GET http://localhost:8001/comet_assets/js/comet.js <serve_comet_assets>
-[2015-01-10T14:47:56Z] CometHTTP [200] 127.0.0.1 GET http://localhost:8001/ <index>
-[2015-01-10T14:47:56Z] CometHTTP [304] 127.0.0.1 GET http://localhost:8001/assets/css/all-nocdn.css <serve_assets>
-[2015-01-10T14:47:56Z] CometHTTP [304] 127.0.0.1 GET http://localhost:8001/comet_assets/css/comet.css <serve_comet_assets>
-[2015-01-10T14:47:56Z] CometHTTP [304] 127.0.0.1 GET http://localhost:8001/assets/js/all-nocdn.js <serve_assets>
-[2015-01-10T14:47:56Z] CometHTTP [304] 127.0.0.1 GET http://localhost:8001/comet_assets/js/comet.js <serve_comet_assets>
-[2015-01-10T14:48:12Z] INFO: Comet: COMET CMS running @ http://localhost:8001/
-[2015-01-10T14:48:13Z] CometHTTP [200] 127.0.0.1 GET http://localhost:8001/ <index>
-[2015-01-10T14:48:13Z] CometHTTP [304] 127.0.0.1 GET http://localhost:8001/assets/css/all-nocdn.css <serve_assets>
-[2015-01-10T14:48:13Z] CometHTTP [304] 127.0.0.1 GET http://localhost:8001/comet_assets/css/comet.css <serve_comet_assets>
-[2015-01-10T14:48:13Z] CometHTTP [304] 127.0.0.1 GET http://localhost:8001/assets/js/all-nocdn.js <serve_assets>
-[2015-01-10T14:48:13Z] CometHTTP [304] 127.0.0.1 GET http://localhost:8001/comet_assets/js/comet.js <serve_comet_assets>
-[2015-01-10T14:48:29Z] INFO: Comet: COMET CMS running @ http://localhost:8001/
-[2015-01-10T14:48:30Z] CometHTTP [200] 127.0.0.1 GET http://localhost:8001/ <index>
-[2015-01-10T14:48:30Z] CometHTTP [304] 127.0.0.1 GET http://localhost:8001/assets/css/all-nocdn.css <serve_assets>
-[2015-01-10T14:48:30Z] CometHTTP [304] 127.0.0.1 GET http://localhost:8001/comet_assets/css/comet.css <serve_comet_assets>
-[2015-01-10T14:48:30Z] CometHTTP [304] 127.0.0.1 GET http://localhost:8001/assets/js/all-nocdn.js <serve_assets>
-[2015-01-10T14:48:30Z] CometHTTP [304] 127.0.0.1 GET http://localhost:8001/comet_assets/js/comet.js <serve_comet_assets>
-[2015-01-10T14:48:31Z] CometHTTP [200] 127.0.0.1 GET http://localhost:8001/ <index>
-[2015-01-10T14:48:31Z] CometHTTP [304] 127.0.0.1 GET http://localhost:8001/assets/css/all-nocdn.css <serve_assets>
-[2015-01-10T14:48:31Z] CometHTTP [304] 127.0.0.1 GET http://localhost:8001/comet_assets/css/comet.css <serve_comet_assets>
-[2015-01-10T14:48:31Z] CometHTTP [304] 127.0.0.1 GET http://localhost:8001/assets/js/all-nocdn.js <serve_assets>
-[2015-01-10T14:48:31Z] CometHTTP [304] 127.0.0.1 GET http://localhost:8001/comet_assets/js/comet.js <serve_comet_assets>
-[2015-01-10T14:48:34Z] CometHTTP [200] 127.0.0.1 GET http://localhost:8001/ <index>
-[2015-01-10T14:48:34Z] CometHTTP [304] 127.0.0.1 GET http://localhost:8001/assets/css/all-nocdn.css <serve_assets>
-[2015-01-10T14:48:34Z] CometHTTP [304] 127.0.0.1 GET http://localhost:8001/comet_assets/css/comet.css <serve_comet_assets>
-[2015-01-10T14:48:34Z] CometHTTP [304] 127.0.0.1 GET http://localhost:8001/assets/js/all-nocdn.js <serve_assets>
-[2015-01-10T14:48:34Z] CometHTTP [304] 127.0.0.1 GET http://localhost:8001/comet_assets/js/comet.js <serve_comet_assets>
-[2015-01-10T14:48:38Z] INFO: Comet: COMET CMS running @ http://localhost:8001/
-[2015-01-10T14:53:57Z] INFO: Comet: COMET CMS running @ http://localhost:8001/
-[2015-01-10T14:54:13Z] INFO: Comet: COMET CMS running @ http://localhost:8001/
-[2015-01-10T14:54:55Z] INFO: Comet: COMET CMS running @ http://localhost:8001/
-[2015-01-10T14:55:00Z] INFO: Comet: COMET CMS running @ http://localhost:8001/
-[2015-01-10T14:55:38Z] INFO: Comet: COMET CMS running @ http://localhost:8001/
-[2015-01-10T14:55:50Z] CometHTTP [200] 127.0.0.1 GET http://localhost:8001/ <index>
-[2015-01-10T14:55:50Z] CometHTTP [304] 127.0.0.1 GET http://localhost:8001/assets/css/all-nocdn.css <serve_assets>
-[2015-01-10T14:55:50Z] CometHTTP [304] 127.0.0.1 GET http://localhost:8001/comet_assets/css/comet.css <serve_comet_assets>
-[2015-01-10T14:55:50Z] CometHTTP [304] 127.0.0.1 GET http://localhost:8001/assets/js/all-nocdn.js <serve_assets>
-[2015-01-10T14:55:50Z] CometHTTP [304] 127.0.0.1 GET http://localhost:8001/comet_assets/js/comet.js <serve_comet_assets>
-[2015-01-10T14:57:16Z] CometHTTP [200] 127.0.0.1 GET http://localhost:8001/ <index>
-[2015-01-10T14:57:16Z] CometHTTP [304] 127.0.0.1 GET http://localhost:8001/assets/css/all-nocdn.css <serve_assets>
-[2015-01-10T14:57:16Z] CometHTTP [304] 127.0.0.1 GET http://localhost:8001/comet_assets/css/comet.css <serve_comet_assets>
-[2015-01-10T14:57:16Z] CometHTTP [304] 127.0.0.1 GET http://localhost:8001/assets/js/all-nocdn.js <serve_assets>
-[2015-01-10T14:57:16Z] CometHTTP [304] 127.0.0.1 GET http://localhost:8001/comet_assets/js/comet.js <serve_comet_assets>
-[2015-01-10T14:57:45Z] INFO: Comet: COMET CMS running @ http://localhost:8001/
-[2015-01-10T15:00:02Z] INFO: Comet: COMET CMS running @ http://localhost:8001/
-[2015-01-10T15:04:33Z] INFO: Nikola: Scanning posts.
-[2015-01-10T15:04:33Z] INFO: Comet: COMET CMS running @ http://localhost:8001/
-[2015-01-10T15:04:34Z] INFO: Nikola: Scanning posts.
-[2015-01-10T15:04:34Z] INFO: Comet: COMET CMS running @ http://localhost:8001/
-[2015-01-10T15:04:47Z] INFO: Nikola: Scanning posts...
-[2015-01-10T15:04:47Z] INFO: Nikola: Posts scanned.
-[2015-01-10T15:04:47Z] INFO: Comet: COMET CMS running @ http://localhost:8001/
-[2015-01-10T15:05:10Z] INFO: Nikola: Scanning posts...
-[2015-01-10T15:05:10Z] INFO: Nikola: Posts scanned.
-[2015-01-10T15:05:10Z] INFO: Comet: COMET CMS running @ http://localhost:8001/
-[2015-01-10T15:05:13Z] CometHTTP [500] 127.0.0.1 POST http://localhost:8001/new/post <new_post_or_page>
-[2015-01-10T15:05:18Z] INFO: Nikola: Scanning posts...
-[2015-01-10T15:05:18Z] INFO: Nikola: Posts scanned.
-[2015-01-10T15:05:18Z] CometHTTP [302] 127.0.0.1 POST http://localhost:8001/new/post <new_post_or_page>
-[2015-01-10T15:05:18Z] CometHTTP [200] 127.0.0.1 GET http://localhost:8001/ <index>
-[2015-01-10T15:06:17Z] INFO: Nikola: Scanning posts...
-[2015-01-10T15:06:17Z] INFO: Nikola: Posts scanned.
-[2015-01-10T15:06:17Z] INFO: Comet: COMET CMS running @ http://localhost:8001/
-[2015-01-10T15:16:50Z] INFO: Nikola: Scanning posts...
-[2015-01-10T15:16:50Z] INFO: Nikola: Posts scanned.
-[2015-01-10T15:16:50Z] INFO: Comet: COMET CMS running @ http://localhost:8001/
-[2015-01-10T15:18:20Z] INFO: Nikola: Scanning posts...
-[2015-01-10T15:18:20Z] INFO: Nikola: Posts scanned.
-[2015-01-10T15:18:20Z] INFO: Comet: COMET CMS running @ http://localhost:8001/
-[2015-01-10T15:18:29Z] CometHTTP [200] 127.0.0.1 GET http://localhost:8001/ <index>
-[2015-01-10T15:18:29Z] CometHTTP [304] 127.0.0.1 GET http://localhost:8001/assets/css/all-nocdn.css <serve_assets>
-[2015-01-10T15:18:29Z] CometHTTP [304] 127.0.0.1 GET http://localhost:8001/comet_assets/css/comet.css <serve_comet_assets>
-[2015-01-10T15:18:29Z] CometHTTP [304] 127.0.0.1 GET http://localhost:8001/assets/js/all-nocdn.js <serve_assets>
-[2015-01-10T15:18:29Z] CometHTTP [304] 127.0.0.1 GET http://localhost:8001/comet_assets/js/comet.js <serve_comet_assets>
-[2015-01-10T15:18:51Z] INFO: Nikola: Scanning posts...
-[2015-01-10T15:18:51Z] INFO: Nikola: Posts scanned.
-[2015-01-10T15:18:51Z] INFO: Comet: COMET CMS running @ http://localhost:8001/
-[2015-01-10T15:19:02Z] INFO: Nikola: Scanning posts...
-[2015-01-10T15:19:02Z] INFO: Nikola: Posts scanned.
-[2015-01-10T15:19:02Z] INFO: Comet: COMET CMS running @ http://localhost:8001/
-[2015-01-10T15:19:34Z] INFO: Nikola: Scanning posts...
-[2015-01-10T15:19:34Z] INFO: Nikola: Posts scanned.
-[2015-01-10T15:19:34Z] INFO: Comet: COMET CMS running @ http://localhost:8001/
-[2015-01-10T15:19:39Z] CometHTTP [200] 127.0.0.1 GET http://localhost:8001/ <index>
-[2015-01-10T15:19:39Z] CometHTTP [304] 127.0.0.1 GET http://localhost:8001/assets/css/all-nocdn.css <serve_assets>
-[2015-01-10T15:19:39Z] CometHTTP [304] 127.0.0.1 GET http://localhost:8001/comet_assets/css/comet.css <serve_comet_assets>
-[2015-01-10T15:19:39Z] CometHTTP [304] 127.0.0.1 GET http://localhost:8001/assets/js/all-nocdn.js <serve_assets>
-[2015-01-10T15:19:39Z] CometHTTP [304] 127.0.0.1 GET http://localhost:8001/comet_assets/js/comet.js <serve_comet_assets>
-[2015-01-10T15:19:41Z] CometHTTP [500] 127.0.0.1 GET http://localhost:8001/rebuild <rebuild>
-[2015-01-10T15:19:50Z] INFO: Nikola: Scanning posts...
-[2015-01-10T15:19:50Z] INFO: Nikola: Posts scanned.
-[2015-01-10T15:19:50Z] INFO: Comet: COMET CMS running @ http://localhost:8001/
-[2015-01-10T15:20:03Z] INFO: Nikola: Scanning posts...
-[2015-01-10T15:20:03Z] INFO: Nikola: Posts scanned.
-[2015-01-10T15:20:03Z] INFO: Comet: COMET CMS running @ http://localhost:8001/
-[2015-01-10T15:21:20Z] CometHTTP [200] 127.0.0.1 GET http://localhost:8001/ <index>
-[2015-01-10T15:21:20Z] CometHTTP [304] 127.0.0.1 GET http://localhost:8001/assets/css/all-nocdn.css <serve_assets>
-[2015-01-10T15:21:20Z] CometHTTP [304] 127.0.0.1 GET http://localhost:8001/comet_assets/css/comet.css <serve_comet_assets>
-[2015-01-10T15:21:21Z] CometHTTP [304] 127.0.0.1 GET http://localhost:8001/assets/js/all-nocdn.js <serve_assets>
-[2015-01-10T15:21:21Z] CometHTTP [304] 127.0.0.1 GET http://localhost:8001/comet_assets/js/comet.js <serve_comet_assets>
-[2015-01-10T15:21:25Z] INFO: Nikola: Scanning posts...
-[2015-01-10T15:21:25Z] INFO: Nikola: Posts scanned.
-[2015-01-10T15:21:25Z] INFO: Comet: COMET CMS running @ http://localhost:8001/
-[2015-01-10T15:21:26Z] INFO: Nikola: Scanning posts...
-[2015-01-10T15:21:26Z] INFO: Nikola: Posts scanned.
-[2015-01-10T15:21:26Z] INFO: Comet: COMET CMS running @ http://localhost:8001/
-[2015-01-10T15:21:26Z] CometHTTP [200] 127.0.0.1 GET http://localhost:8001/ <index>
-[2015-01-10T15:21:26Z] CometHTTP [304] 127.0.0.1 GET http://localhost:8001/assets/css/all-nocdn.css <serve_assets>
-[2015-01-10T15:21:26Z] CometHTTP [304] 127.0.0.1 GET http://localhost:8001/comet_assets/css/comet.css <serve_comet_assets>
-[2015-01-10T15:21:26Z] CometHTTP [304] 127.0.0.1 GET http://localhost:8001/assets/js/all-nocdn.js <serve_assets>
-[2015-01-10T15:21:26Z] CometHTTP [304] 127.0.0.1 GET http://localhost:8001/comet_assets/js/comet.js <serve_comet_assets>
-[2015-01-10T15:22:18Z] INFO: Nikola: Scanning posts...
-[2015-01-10T15:22:18Z] INFO: Nikola: Posts scanned.
-[2015-01-10T15:22:18Z] INFO: Comet: COMET CMS running @ http://localhost:8001/
-[2015-01-10T15:22:23Z] INFO: Nikola: Scanning posts...
-[2015-01-10T15:22:23Z] INFO: Nikola: Posts scanned.
-[2015-01-10T15:22:23Z] CometHTTP [302] 127.0.0.1 GET http://localhost:8001/rescan <rescan>
-[2015-01-10T15:22:23Z] CometHTTP [200] 127.0.0.1 GET http://localhost:8001/ <index>
diff --git a/comet/__init__.py b/comet/__init__.py
index 16ee6e4..9b2b71f 100644
--- a/comet/__init__.py
+++ b/comet/__init__.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
+# Comet CMS v0.6.0
 # Copyright © 2014-2015 Chris Warrick, Roberto Alsina et al.
 
 # Permission is hereby granted, free of charge, to any
@@ -24,830 +25,6 @@
 # OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-from __future__ import print_function, unicode_literals
-import json
-import os
-import sys
-import webbrowser
-import io
-import pkg_resources
-import nikola.__main__
-import logbook
-from nikola.utils import unicode_str, get_logger, ColorfulStderrHandler
-import nikola.plugins.command.new_post
-from flask import Flask, request, redirect, send_from_directory, g, session
-from flask.ext.login import (LoginManager, login_required, login_user,
-                             logout_user, current_user, make_secure_token)
-from flask.ext.bcrypt import Bcrypt
+from __future__ import unicode_literals
 
-__version__ = '0.5.0'
-
-
-site = None
-app = None
-
-
-def scan_site():
-    """Rescan the site."""
-    nikola.utils.LOGGER.info("Scanning posts...")
-    site.scan_posts(really=True, quiet=True)
-    nikola.utils.LOGGER.info("Posts scanned.")
-
-
-def configure_site(url=None):
-    """Configure the site for Comet."""
-    global site
-
-    nikola.__main__._RETURN_DOITNIKOLA = True
-    _dn = nikola.__main__.main([])
-    _dn.sub_cmds = _dn.get_commands()
-    site = _dn.nikola
-    app.config['NIKOLA_ROOT'] = os.getcwd()
-    app.config['DEBUG'] = False
-    app.config['USERS'] = {}
-    app.config['USERS_PATH'] = os.path.join(app.config['NIKOLA_ROOT'],
-                                            'comet_users.json')
-
-    logf = (u'[{record.time:%Y-%m-%dT%H:%M:%SZ}] {record.level_name}: '
-            u'{record.channel}: {record.message}')
-    logh = (u'[{record.time:%Y-%m-%dT%H:%M:%SZ}] {record.channel} '
-            u'{record.message}')
-
-    loghandlers = [
-        ColorfulStderrHandler(level=logbook.DEBUG, format_string=logf,
-                              bubble=True),
-        logbook.FileHandler('comet.log', 'a', 'utf-8', logbook.DEBUG, logf,
-                            bubble=True)
-    ]
-
-    hloghandlers = [
-        ColorfulStderrHandler(level=logbook.DEBUG, format_string=logh,
-                              bubble=True),
-        logbook.FileHandler('comet.log', 'a', 'utf-8', logbook.DEBUG, logh,
-                            bubble=True)
-    ]
-
-    site.loghandlers = loghandlers
-    nikola.utils.LOGGER.handlers = loghandlers
-
-    nikola.plugins.command.new_post.POSTLOGGER.handlers = loghandlers
-    nikola.plugins.command.new_post.PAGELOGGER.handlers = loghandlers
-
-    app.config['LOGGER_NAME'] = 'Comet'
-    app._logger = get_logger('Comet', loghandlers)
-    app.http_logger = get_logger('CometHTTP', hloghandlers)
-
-    if site.configured:
-        scan_site()
-    else:
-        raise Exception("Not a Nikola site.")
-
-    app.secret_key = site.config['COMET_SECRET_KEY']
-    app.config['COMET_URL'] = url or site.config['COMET_URL']
-
-    read_users()
-
-    site.template_hooks['menu_alt'].append(generate_menu_alt)
-
-    app.config['NIKOLA_URL'] = site.config['SITE_URL']
-    site.config['SITE_URL'] = site.config['BASE_URL'] =\
-        site.GLOBAL_CONTEXT['blog_url'] = app.config['COMET_URL']
-    site.config['NAVIGATION_LINKS'] = {
-        'en': (
-            (app.config['NIKOLA_URL'], '<i class="fa fa-globe"></i> Back to website'),
-            ('/rebuild', '<i class="fa fa-cog rebuild"></i> Rebuild'),
-        )
-    }
-    site.GLOBAL_CONTEXT['navigation_links'] = site.config['NAVIGATION_LINKS']
-    TITLE = site.GLOBAL_CONTEXT['blog_title']('en') + ' Administration'
-    site.config['BLOG_TITLE'] = lambda _: TITLE
-    site.GLOBAL_CONTEXT['blog_title'] = lambda _: TITLE
-    site.GLOBAL_CONTEXT['lang'] = 'en'
-    site.GLOBAL_CONTEXT['extra_head_data'] = lambda _: (
-        """<link href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/"""
-        """font-awesome.min.css" rel="stylesheet">
-    <link href="/comet_assets/css/comet.css" rel="stylesheet">""")
-    # HACK: body_end appears after extra_js from templates, so we must use
-    #       social_buttons_code instead
-    site.GLOBAL_CONTEXT['social_buttons_code'] = lambda _: """
-    <script src="/comet_assets/js/comet.js"></scripts>
-    """
-
-    tmpl_dir = pkg_resources.resource_filename(
-        'comet', os.path.join('data', 'templates', site.template_system.name))
-    if os.path.isdir(tmpl_dir):
-        # Inject tmpl_dir low in the theme chain
-        site.template_system.inject_directory(tmpl_dir)
-
-
-def password_hash(password):
-    """Hash the password, using bcrypt.
-
-    :param str password: Password in plaintext
-    :return: password hash
-    :rtype: str
-    """
-    return bcrypt.generate_password_hash(password)
-
-
-def check_password(pwdhash, password):
-    """Check the password hash from :func:`password_hash`.
-
-    :param str pwdhash: Hash from :func:`password_hash` to check
-    :param str password: Password in plaintext
-    :return: password match
-    :rtype: bool
-    """
-    return bcrypt.check_password_hash(pwdhash, password)
-
-
-def generate_menu_alt():
-    """Generate ``menu_alt`` with log in/out links.
-
-    :return: HTML fragment
-    :rtype: str
-    """
-    if not current_user.is_authenticated():
-        return """<li><a href="/login">Log in</a></li>"""
-    if current_user.is_admin:
-        edit_entry = """<li><a href="/users">Manage users</a></li>\
-        <li><a href="/users/permissions">Permissions</a></li>"""
-    else:
-        edit_entry = ''
-    return """
-    <li class="dropdown">
-        <a href="#" class="dropdown-toggle" data-toggle="dropdown"
-            role="button" aria-expanded="false">{0} [{1}]<span
-            class="caret"></span></a>
-        <ul class="dropdown-menu" role="menu">
-            <li><a href="/account">Account</a></li>
-            {2}
-            <li><a href="/logout">Log out</a></li>
-        </ul>
-    </li>""".format(current_user.realname, current_user.username, edit_entry)
-
-
-def _author_get(post):
-    """Get the name of the post author.
-
-    :param Post post: The post object to determine authorship of
-    :return: Author real name
-    :rtype: str
-    """
-    a = post.meta['en']['author']
-    return a if a else current_user.realname
-
-
-def _author_uid_get(post):
-    """Get the UID of the post author.
-
-    :param Post post: The post object to determine authorship of
-    :return: Author UID
-    :rtype: str
-    """
-    u = post.meta['en']['author.uid']
-    return u if u else str(current_user.uid)
-
-
-def render(template_name, context=None, code=200, headers=None):
-    """Render a response using standard Nikola templates.
-
-    :param str template_name: Template name
-    :param dict context: Context (variables) to use in the template
-    :param int code: HTTP status code
-    :param headers: Headers to use for the response
-    :return: HTML fragment
-    :rtype: str
-    """
-    if context is None:
-        context = {}
-    if headers is None:
-        headers = {}
-
-    context['g'] = g
-    context['request'] = request
-    context['session'] = session
-    context['current_user'] = current_user
-    context['_author_get'] = _author_get
-    context['_author_uid_get'] = _author_uid_get
-
-    headers['Pragma'] = 'no-cache'
-    headers['Cache-Control'] = 'private, max-age=0, no-cache'
-
-    return site.render_template(template_name, None, context), code, headers
-
-
-def error(desc, code, permalink):
-    """Render an error page.
-
-    :param str desc: Error description
-    :param int code: HTTP status code
-    :param str permalink: Path to page generating errors
-    :return: HTML fragment (from :func:`render`)
-    :rtype: str
-    """
-    return render('comet_error.tmpl',
-                  {'title': 'Error',
-                   'code': code,
-                   'desc': desc,
-                   'permalink': permalink},
-                  code)
-
-
-def _unauthorized():
-    """Redirect to the “unauthorized” page."""
-    return redirect('/login?status=unauthorized')
-
-
-def find_post(path):
-    """Find a post.
-
-    :param str path: Path to the post
-    :return: A post matching the path
-    :rtype: Post or None
-    """
-    for p in site.timeline:
-        if p.source_path == path:
-            return p
-    return None
-
-
-app = Flask('comet')
-app.config['BCRYPT_LOG_ROUNDS'] = 12
-
-
-@app.after_request
-def log_request(resp):
-    """Log a request."""
-    l = "[{4}] {0} {1} {2} <{3}>".format(request.remote_addr, request.method,
-                                         request.url, request.endpoint,
-                                         resp.status_code)
-    c = str(resp.status_code)[0]
-    if c in ['1', '2'] or resp.status_code == 304:
-        app.http_logger.info(l)
-    elif c == '3':
-        app.http_logger.warn(l)
-    else:
-        app.http_logger.error(l)
-    return resp
-
-bcrypt = Bcrypt(app)
-login_manager = LoginManager()
-login_manager.init_app(app)
-login_manager.unauthorized_callback = _unauthorized
-PERMISSIONS = ['is_admin', 'can_edit_all_posts', 'wants_all_posts',
-               'can_upload_attachments', 'can_rebuild_site',
-               'can_transfer_post_authorship']
-
-
-class User(object):
-    """An user.  Compatible with Flask-Login."""
-    def __init__(self, uid, username, realname, password, active, is_admin,
-                 can_edit_all_posts, wants_all_posts,
-                 can_upload_attachments, can_rebuild_site,
-                 can_transfer_post_authorship):
-        """Initialize an user with specified settings."""
-        self.uid = uid
-        self.username = username
-        self.realname = realname
-        self.password = password
-        self.active = active
-        self.is_admin = is_admin
-        self.can_edit_all_posts = can_edit_all_posts
-        self.wants_all_posts = wants_all_posts
-        self.can_upload_attachments = can_upload_attachments
-        self.can_rebuild_site = can_rebuild_site
-        self.can_transfer_post_authorship = can_transfer_post_authorship
-
-    def get_id(self):
-        """Get user ID."""
-        return unicode_str(self.uid)
-
-    def is_authenticated(self):
-        """Check whether user is authorized to log in."""
-        return self.active
-
-    def is_active(self):
-        """Check whether user is active."""
-        return self.active
-
-    def is_anonymous(self):
-        """Check whether user is anonymous."""
-        return not self.active
-
-    def get_auth_token(self):
-        """Generate an authentication token."""
-        return make_secure_token(self.uid, self.username, self.password)
-
-    def __repr__(self):
-        """Return a programmer-friendly representation."""
-        return '<User {0}>'.format(self.username)
-
-
-@login_manager.user_loader
-def get_user(uid):
-    """Get an user by the UID.
-
-    :param str uid: UID to find
-    :return: the user
-    :rtype: User object
-    :raises ValueError: uid is not an integer
-    :raises KeyError: if user does not exist
-    """
-    return app.config['USERS'][int(uid)]
-
-
-def find_user_by_name(username):
-    """Get an user by their username.
-
-    :param str username: Username to find
-    :return: the user
-    :rtype: User object or None
-    """
-    for uid, u in app.config['USERS'].items():
-        if u.username == username:
-            return u
-            break
-
-
-def read_users():
-    """Read user data from the JSON file."""
-    app.config['USERS'] = {}
-
-    if not os.path.exists(app.config['USERS_PATH']):
-        raise Exception("Cannot find comet_users.json.")
-
-    with io.open(app.config['USERS_PATH'], 'r', encoding='utf-8') as fh:
-        udict = json.load(fh)
-    for uid, data in udict.items():
-        uid = int(uid)
-        app.config['USERS'][uid] = User(uid, **data)
-
-
-def write_users():
-    """Write user data to the JSON file."""
-    udict = {}
-    for uid, user in app.config['USERS'].items():
-        uid = unicode_str(uid)
-        udict[uid] = {
-            'username': user.username,
-            'realname': user.realname,
-            'password': user.password,
-            'active': user.active,
-        }
-        for p in PERMISSIONS:
-            udict[uid][p] = getattr(user, p)
-    with open(app.config['USERS_PATH'], 'w') as fh:
-        json.dump(udict, fh, indent=4, sort_keys=True, separators=(',', ': '))
-
-
-@app.route('/login', methods=['GET', 'POST'])
-def login():
-    """Handle user authentication.
-
-    If requested over GET, present login page.
-    If requested over POST, log user in.
-
-    :param str status: Status of previous request/login attempt
-    """
-    alert = None
-    alert_status = 'danger'
-    code = 200
-    if request.method == 'POST':
-        user = find_user_by_name(request.form['username'])
-        if not user:
-            alert = 'Invalid credentials.'
-            code = 401
-        else:
-            if check_password(user.password,
-                              request.form['password']) and user.active:
-                login_user(user, remember=('remember-me' in request.form))
-                return redirect('/')
-            else:
-                alert = "Invalid credentials."
-                code = 401
-    else:
-        if request.args.get('status') == 'unauthorized':
-            alert = 'Please log in to access this page.'
-        elif request.args.get('status') == 'logout':
-            alert = 'Logged out successfully.'
-            alert_status = 'success'
-    return render('comet_login.tmpl', {'title': 'Login', 'permalink': '/login',
-                                       'alert': alert,
-                                       'alert_status': alert_status}, code)
-
-
-@app.route('/logout')
-@login_required
-def logout():
-    """Log the user out and redirect them to the login page."""
-    logout_user()
-    return redirect('/login?status=logout')
-
-
-@app.route('/')
-@login_required
-def index():
-    """Show the index with all posts.
-
-    :param int all: Whether or not should show all posts
-    """
-    if not os.path.exists(os.path.join(site.config["OUTPUT_FOLDER"],
-                                       'assets')):
-        return redirect('/setup')
-
-    context = {}
-
-    n = request.args.get('all')
-    if n is None:
-        wants_now = None
-    else:
-        wants_now = n == '1'
-
-    if wants_now is None and current_user.wants_all_posts:
-        wants = True
-    else:
-        wants = wants_now
-
-    if current_user.can_edit_all_posts and wants:
-        posts = site.posts
-        pages = site.pages
-    else:
-        wants = False
-        posts = []
-        pages = []
-        for p in site.timeline:
-            if (p.meta('author.uid')
-                    and p.meta('author.uid') != str(current_user.uid)):
-                continue
-            if p.use_in_feeds:
-                posts.append(p)
-            else:
-                pages.append(p)
-
-    context['posts'] = posts
-    context['pages'] = pages
-    context['title'] = 'Posts & Pages'
-    context['permalink'] = '/'
-    context['wants'] = wants
-    return render('comet_index.tmpl', context)
-
-
-# TODO: delete (with redirects) as soon as `comet init` and real docs exist
-@app.route('/setup')
-def setup():
-    """TEMPORARY setup function."""
-    ns = not os.path.exists(os.path.join(site.config["OUTPUT_FOLDER"],
-                                         'assets'))
-    return render("comet_setup.tmpl", context={'needs_setup': ns})
-
-
-@app.route('/edit/<path:path>', methods=['GET', 'POST'])
-@login_required
-def edit(path):
-    """Edit a post.
-
-    If requested over GET, shows the edit UI.
-    If requested over POST, saves the post and shows the edit UI.
-
-    :param path: Path to post to edit.
-    """
-    context = {'path': path, 'site': site}
-    post = find_post(path)
-    if post is None:
-        return error("No such post or page.", 404, '/edit/' + path)
-
-    if request.method == 'POST':
-        meta = {}
-        for k, v in request.form.items():
-            meta[k] = v
-        meta.pop('_wysihtml5_mode', '')
-        try:
-            meta['author'] = get_user(int(meta['author.uid'])).realname
-            author_change_success = True
-        except:
-            author_change_success = False
-        if (not current_user.can_transfer_post_authorship
-                or not author_change_success):
-            meta['author'] = post.meta('author') or current_user.realname
-            meta['author.uid'] = post.meta('author.uid') or current_user.uid
-        post.compiler.create_post(post.source_path, onefile=True,
-                                  is_page=False, **meta)
-        scan_site()
-        post = find_post(path)
-        context['action'] = 'save'
-        context['post_content'] = meta['content']
-    else:
-        context['action'] = 'edit'
-        with io.open(path, 'r', encoding='utf-8') as fh:
-            context['post_content'] = fh.read().split('\n\n', 1)[1]
-
-    context['post'] = post
-    safe_users = []
-    for u in app.config['USERS'].values():
-        safe_users.append((u.uid, u.realname))
-    context['USERS'] = sorted(safe_users)
-    context['current_auid'] = int(post.meta('author.uid') or current_user.uid)
-    context['title'] = 'Editing {0}'.format(post.title())
-    context['permalink'] = '/edit/' + path
-    return render('comet_post_edit.tmpl', context)
-
-
-@app.route('/delete', methods=['POST'])
-@login_required
-def delete():
-    """Delete a post."""
-    path = request.form['path']
-    for p in site.timeline:
-        if p.source_path == path:
-            post = p
-            break
-    if post is None:
-        return error("No such post or page.", 404, '/delete')
-    os.unlink(path)
-    scan_site()
-    return redirect('/')
-
-
-
-@app.route('/rebuild')
-@login_required
-def rebuild():
-    """Rebuild the site."""
-    return "<h1>Not implemented.</h1>", 500
-
-
-@app.route('/rescan')
-@login_required
-def rescan():
-    """Rescan posts."""
-    scan_site()
-    return redirect('/')
-
-@app.route('/wysihtml/<path:path>')
-def serve_wysihtml(path):
-    """Serve wysihtml files.
-
-    This is meant to be used ONLY by the internal dev server.
-    Please configure your web server to handle requests to this URL::
-
-        /wysihtml/ => comet/data/bower_components/wysihtml
-    """
-    res = pkg_resources.resource_filename(
-        'comet', os.path.join('data', 'bower_components', 'wysihtml'))
-    return send_from_directory(res, path)
-
-
-@app.route('/comet_assets/<path:path>')
-def serve_comet_assets(path):
-    """Serve Comet assets.
-
-    This is meant to be used ONLY by the internal dev server.
-    Please configure your web server to handle requests to this URL::
-
-        /comet_assets/ => comet/data/comet_assets
-    """
-    res = pkg_resources.resource_filename(
-        'comet', os.path.join('data', 'comet_assets'))
-    return send_from_directory(res, path)
-
-
-@app.route('/assets/<path:path>')
-def serve_assets(path):
-    """Serve Nikola assets.
-
-    This is meant to be used ONLY by the internal dev server.
-    Please configure your web server to handle requests to this URL::
-
-        /assets/ => output/assets
-    """
-    res = os.path.join(app.config['NIKOLA_ROOT'],
-                       site.config["OUTPUT_FOLDER"], 'assets')
-    return send_from_directory(res, path)
-
-
-@app.route('/new/<obj>', methods=['POST'])
-@login_required
-def new(obj):
-    """Create a new post or page.
-
-    :param str obj: Object to create (post or page)
-    """
-    title = request.form['title']
-    site.config['ADDITIONAL_METADATA']['author.uid'] = current_user.uid
-    try:
-        if obj == 'post':
-            site.commands.new_post(title=title, author=current_user.realname,
-                                   content_format='html')
-        elif obj == 'page':
-            site.commands.new_page(title=title, author=current_user.realname,
-                                   content_format='html')
-        else:
-            return error("Cannot create {0} — unknown type.".format(obj),
-                         400, '/new/' + obj)
-    except SystemExit:
-        return error("This {0} already exists!".format(obj),
-                     500, '/new/' + obj)
-    finally:
-        del site.config['ADDITIONAL_METADATA']['author.uid']
-    # reload post list and go to index
-    scan_site()
-    return redirect('/')
-
-
-@app.route('/account', methods=['POST', 'GET'])
-@login_required
-def acp_user_account():
-    """Manage the user account of currently-logged-in users.
-
-    This does NOT accept admin-specific options.
-    """
-    alert = ''
-    alert_status = ''
-    action = 'edit'
-    if request.method == 'POST':
-        action = 'save'
-        data = request.form
-        if data['newpwd1']:
-            if data['newpwd1'] == data['newpwd2'] and check_password(
-                    current_user.password, data['oldpwd']):
-                current_user.password = password_hash(data['newpwd1'])
-            else:
-                alert = 'Passwords don’t match.'
-                alert_status = 'danger'
-                action = 'save_fail'
-        current_user.realname = data['realname']
-        current_user.wants_all_posts = 'wants_all_posts' in data
-        write_users()
-
-    return render('comet_account.tmpl',
-                  context={'title': 'My account',
-                           'permalink': '/account',
-                           'action': action,
-                           'alert': alert,
-                           'alert_status': alert_status})
-
-
-@app.route('/users')
-@login_required
-def acp_users():
-    """List all users."""
-    alert = ''
-    alert_status = ''
-    if request.args.get('status') == 'deleted':
-        alert = 'User deleted.'
-        alert_status = 'success'
-    if request.args.get('status') == 'undeleted':
-        alert = 'User undeleted.'
-        alert_status = 'success'
-    if not current_user.is_admin:
-        return error("Not authorized to edit users.", 401, "/users")
-    else:
-        return render('comet_users.tmpl',
-                      context={'title': 'Users',
-                               'permalink': '/users',
-                               'USERS': app.config['USERS'],
-                               'alert': alert,
-                               'alert_status': alert_status})
-
-
-@app.route('/users/edit', methods=['POST'])
-@login_required
-def acp_users_edit():
-    """Edit an user account."""
-    if not current_user.is_admin:
-        return error("Not authorized to edit users.", 401, "/users/edit")
-    data = request.form
-    action = data['action']
-
-    if action == 'new':
-        uid = max(app.config['USERS']) + 1
-        app.config['USERS'][uid] = User(uid, data['username'], '', '', True,
-                                        False, True, True, True, True)
-        user = app.config['USERS'][uid]
-        new = True
-    else:
-        user = get_user(data['uid'])
-        new = False
-
-    if not user:
-        return error("User does not exist.", 404, "/users/edit")
-
-    alert = ''
-    alert_status = ''
-
-    if action == 'save':
-        if data['newpwd1']:
-            if data['newpwd1'] == data['newpwd2']:
-                user.password = password_hash(data['newpwd1'])
-            else:
-                alert = 'Passwords don’t match.'
-                alert_status = 'danger'
-                action = 'save_fail'
-        elif new:
-            alert = 'Must set a password.'
-            alert_status = 'danger'
-            action = 'save_fail'
-        user.realname = data['realname']
-        for p in PERMISSIONS:
-            setattr(user, p, p in data)
-        if user == current_user:
-            user.is_admin = True
-
-        write_users()
-
-    return render('comet_users_edit.tmpl',
-                  context={'title': 'Edit user',
-                           'permalink': '/users/edit',
-                           'user': user,
-                           'new': new,
-                           'action': action,
-                           'alert': alert,
-                           'alert_status': alert_status})
-
-
-@app.route('/users/delete', methods=['POST'])
-@login_required
-def acp_users_delete():
-    """Delete or undelete an user account."""
-    if not current_user.is_admin:
-        return error("Not authorized to edit users.", 401, "/users/delete")
-    user = get_user(int(request.form['uid']))
-    direction = request.form['direction']
-    if not user:
-        return error("User does not exist.", 404, "/users/edit/delete")
-    else:
-        user.active = direction == 'undel'
-        for p in PERMISSIONS:
-            setattr(user, p, False)
-        write_users()
-        return redirect('/users?status={_del}eted'.format(_del=direction))
-
-
-@app.route('/users/permissions', methods=['GET', 'POST'])
-@login_required
-def acp_users_permissions():
-    """Change user permissions."""
-    if not current_user.is_admin:
-        return error("Not authorized to edit users.",
-                     401, "/users/permissions")
-
-    if request.method == 'POST':
-        for uid, user in app.config['USERS'].items():
-            for perm in PERMISSIONS:
-                if '{0}.{1}'.format(uid, perm) in request.form:
-                    setattr(user, perm, True)
-                else:
-                    setattr(user, perm, False)
-        current_user.is_admin = True  # cannot deadmin oneself
-        action = 'save'
-        write_users()
-    else:
-        action = 'edit'
-
-    def display_permission(user, permission):
-        checked = 'checked' if getattr(user, permission) else ''
-        if permission == 'wants_all_posts' and not user.can_edit_all_posts:
-            # If this happens, permissions are damaged.
-            checked = ''
-        if user == current_user and permission == 'is_admin':
-            disabled = 'disabled'
-        else:
-            disabled = ''
-        d = ('<input type="checkbox" name="{0}.{1}" data-uid="{0}" '
-             'data-perm="{1}" class="u{0}" {2} {3}>')
-        return d.format(user.uid, permission, checked, disabled)
-
-    return render('comet_users_permissions.tmpl',
-                  context={'title': 'Permissions',
-                           'permalink': '/users/permissions',
-                           'USERS': app.config['USERS'],
-                           'PERMISSIONS': PERMISSIONS,
-                           'action': action,
-                           'json': json,
-                           'display_permission': display_permission})
-
-
-# TODO: move somewhere else
-def main():
-    """The main function."""
-    port = 8001  # TODO: make customizable
-    url = 'http://localhost:{0}/'.format(port)
-    configure_site(url)
-    app.config['DEBUG'] = True
-
-    if '-h' in sys.argv:
-        print("COMET CMS v{0}".format(__version__))
-        print("")
-        print("  -b     Open a web browser after starting.")
-    elif '-v' in sys.argv:
-        print("COMET CMS v{0}".format(__version__))
-    else:
-        if '-b' in sys.argv:
-            webbrowser.open('http://localhost:{0}'.format(port))
-
-        app.logger.info("COMET CMS running @ http://localhost:8001/")
-        app.run('localhost', port, debug=True)
-
-if __name__ == '__main__':
-    main()
+__version__ = '0.6.0'
diff --git a/comet/__main__.py b/comet/__main__.py
index 8701b8a..dbe1a45 100644
--- a/comet/__main__.py
+++ b/comet/__main__.py
@@ -1,4 +1,78 @@
+# -*- coding: utf-8 -*-
+
+# Comet CMS v0.6.0
+# Copyright © 2014-2015 Chris Warrick, Roberto Alsina et al.
+
+# Permission is hereby granted, free of charge, to any
+# person obtaining a copy of this software and associated
+# documentation files (the "Software"), to deal in the
+# Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the
+# Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice
+# shall be included in all copies or substantial portions of
+# the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+# PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
+# OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+# OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+u"""Comet CMS v{0}
+
+Usage:
+  comet devserver [-b | --browser] [-p <port> | --port=<port>]
+  comet init [directory]
+  comet -h | --help
+  comet --version
+
+Options:
+ -h, --help                Show help screen.
+ --version                 Show version.
+ -b, --browser             Open Comet in the browser after starting.
+ -p <port>, --port=<port>  Port to use [default: 8001].
+"""
+
 import comet
+import sys
+import docopt
+import webbrowser
+
+__doc__ = __doc__.format(comet.__version__)
+
+def main():
+    u"""The main function."""
+    arguments = docopt.docopt(__doc__, version=u'Comet CMS v{0}'.format(comet.__version__))
+    if arguments[u'init']:
+        sys.exit(init(arguments))
+    elif arguments[u'devserver']:
+        sys.exit(devserver(arguments))
+
+
+def init(arguments):
+    import comet.init
+    return comet.init.init()
+
+def devserver(arguments):
+    import comet.web
+    port = int(arguments[u'port'])
+    url = 'http://localhost:{0}/'.format(port)
+    comet.web.configure_site(url)
+    comet.web.app.config['DEBUG'] = True
+
+    if arguments[u'browser']:
+        webbrowser.open(url)
+    comet.web.app.logger.info(u"Comet CMS running @ http://localhost:8001/")
+    comet.web.app.run('localhost', port, debug=True)
+    return 0
 
 if __name__ == '__main__':
-    comet.main()
+    main()
diff --git a/comet/init.py b/comet/init.py
new file mode 100644
index 0000000..12e784e
--- /dev/null
+++ b/comet/init.py
@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+
+# Comet CMS v0.6.0
+# Copyright © 2014-2015 Chris Warrick, Roberto Alsina et al.
+
+# Permission is hereby granted, free of charge, to any
+# person obtaining a copy of this software and associated
+# documentation files (the "Software"), to deal in the
+# Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the
+# Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice
+# shall be included in all copies or substantial portions of
+# the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+# PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
+# OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+# OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+from __future__ import print_function, unicode_literals
+
+def init():
+    print("ERROR: Not implemented.")
+    return 255
diff --git a/comet/web.py b/comet/web.py
new file mode 100644
index 0000000..b9e9394
--- /dev/null
+++ b/comet/web.py
@@ -0,0 +1,825 @@
+# -*- coding: utf-8 -*-
+
+# Comet CMS v0.6.0
+# Copyright © 2014-2015 Chris Warrick, Roberto Alsina et al.
+
+# Permission is hereby granted, free of charge, to any
+# person obtaining a copy of this software and associated
+# documentation files (the "Software"), to deal in the
+# Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the
+# Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice
+# shall be included in all copies or substantial portions of
+# the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+# PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
+# OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+# OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+from __future__ import print_function, unicode_literals
+import json
+import os
+import io
+import pkg_resources
+import nikola.__main__
+import logbook
+from nikola.utils import unicode_str, get_logger, ColorfulStderrHandler
+import nikola.plugins.command.new_post
+from flask import Flask, request, redirect, send_from_directory, g, session
+from flask.ext.login import (LoginManager, login_required, login_user,
+                             logout_user, current_user, make_secure_token)
+from flask.ext.bcrypt import Bcrypt
+
+
+site = None
+app = None
+
+
+def scan_site():
+    """Rescan the site."""
+    nikola.utils.LOGGER.info("Scanning posts...")
+    site.scan_posts(really=True, quiet=True)
+    nikola.utils.LOGGER.info("Posts scanned.")
+
+
+def configure_site(url=None):
+    """Configure the site for Comet."""
+    global site
+
+    nikola.__main__._RETURN_DOITNIKOLA = True
+    _dn = nikola.__main__.main([])
+    _dn.sub_cmds = _dn.get_commands()
+    site = _dn.nikola
+    app.config['NIKOLA_ROOT'] = os.getcwd()
+    app.config['DEBUG'] = False
+    app.config['USERS'] = {}
+    app.config['USERS_PATH'] = os.path.join(app.config['NIKOLA_ROOT'],
+                                            'comet_users.json')
+
+    logf = (u'[{record.time:%Y-%m-%dT%H:%M:%SZ}] {record.level_name}: '
+            u'{record.channel}: {record.message}')
+    logh = (u'[{record.time:%Y-%m-%dT%H:%M:%SZ}] {record.channel} '
+            u'{record.message}')
+
+    loghandlers = [
+        ColorfulStderrHandler(level=logbook.DEBUG, format_string=logf,
+                              bubble=True),
+        logbook.FileHandler('comet.log', 'a', 'utf-8', logbook.DEBUG, logf,
+                            bubble=True)
+    ]
+
+    hloghandlers = [
+        ColorfulStderrHandler(level=logbook.DEBUG, format_string=logh,
+                              bubble=True),
+        logbook.FileHandler('comet.log', 'a', 'utf-8', logbook.DEBUG, logh,
+                            bubble=True)
+    ]
+
+    site.loghandlers = loghandlers
+    nikola.utils.LOGGER.handlers = loghandlers
+
+    nikola.plugins.command.new_post.POSTLOGGER.handlers = loghandlers
+    nikola.plugins.command.new_post.PAGELOGGER.handlers = loghandlers
+
+    app.config['LOGGER_NAME'] = 'Comet'
+    app._logger = get_logger('Comet', loghandlers)
+    app.http_logger = get_logger('CometHTTP', hloghandlers)
+
+    if site.configured:
+        scan_site()
+    else:
+        raise Exception("Not a Nikola site.")
+
+    app.secret_key = site.config['COMET_SECRET_KEY']
+    app.config['COMET_URL'] = url or site.config['COMET_URL']
+
+    read_users()
+
+    site.template_hooks['menu_alt'].append(generate_menu_alt)
+
+    app.config['NIKOLA_URL'] = site.config['SITE_URL']
+    site.config['SITE_URL'] = site.config['BASE_URL'] =\
+        site.GLOBAL_CONTEXT['blog_url'] = app.config['COMET_URL']
+    site.config['NAVIGATION_LINKS'] = {
+        'en': (
+            (app.config['NIKOLA_URL'], '<i class="fa fa-globe"></i> Back to website'),
+            ('/rebuild', '<i class="fa fa-cog rebuild"></i> Rebuild'),
+        )
+    }
+    site.GLOBAL_CONTEXT['navigation_links'] = site.config['NAVIGATION_LINKS']
+    TITLE = site.GLOBAL_CONTEXT['blog_title']('en') + ' Administration'
+    site.config['BLOG_TITLE'] = lambda _: TITLE
+    site.GLOBAL_CONTEXT['blog_title'] = lambda _: TITLE
+    site.GLOBAL_CONTEXT['lang'] = 'en'
+    site.GLOBAL_CONTEXT['extra_head_data'] = lambda _: (
+        """<link href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/"""
+        """font-awesome.min.css" rel="stylesheet">
+    <link href="/comet_assets/css/comet.css" rel="stylesheet">""")
+    # HACK: body_end appears after extra_js from templates, so we must use
+    #       social_buttons_code instead
+    site.GLOBAL_CONTEXT['social_buttons_code'] = lambda _: """
+    <script src="/comet_assets/js/comet.js"></scripts>
+    """
+
+    tmpl_dir = pkg_resources.resource_filename(
+        'comet', os.path.join('data', 'templates', site.template_system.name))
+    if os.path.isdir(tmpl_dir):
+        # Inject tmpl_dir low in the theme chain
+        site.template_system.inject_directory(tmpl_dir)
+
+
+def password_hash(password):
+    """Hash the password, using bcrypt.
+
+    :param str password: Password in plaintext
+    :return: password hash
+    :rtype: str
+    """
+    return bcrypt.generate_password_hash(password)
+
+
+def check_password(pwdhash, password):
+    """Check the password hash from :func:`password_hash`.
+
+    :param str pwdhash: Hash from :func:`password_hash` to check
+    :param str password: Password in plaintext
+    :return: password match
+    :rtype: bool
+    """
+    return bcrypt.check_password_hash(pwdhash, password)
+
+
+def generate_menu_alt():
+    """Generate ``menu_alt`` with log in/out links.
+
+    :return: HTML fragment
+    :rtype: str
+    """
+    if not current_user.is_authenticated():
+        return """<li><a href="/login">Log in</a></li>"""
+    if current_user.is_admin:
+        edit_entry = """<li><a href="/users">Manage users</a></li>\
+        <li><a href="/users/permissions">Permissions</a></li>"""
+    else:
+        edit_entry = ''
+    return """
+    <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown"
+            role="button" aria-expanded="false">{0} [{1}]<span
+            class="caret"></span></a>
+        <ul class="dropdown-menu" role="menu">
+            <li><a href="/account">Account</a></li>
+            {2}
+            <li><a href="/logout">Log out</a></li>
+        </ul>
+    </li>""".format(current_user.realname, current_user.username, edit_entry)
+
+
+def _author_get(post):
+    """Get the name of the post author.
+
+    :param Post post: The post object to determine authorship of
+    :return: Author real name
+    :rtype: str
+    """
+    a = post.meta['en']['author']
+    return a if a else current_user.realname
+
+
+def _author_uid_get(post):
+    """Get the UID of the post author.
+
+    :param Post post: The post object to determine authorship of
+    :return: Author UID
+    :rtype: str
+    """
+    u = post.meta['en']['author.uid']
+    return u if u else str(current_user.uid)
+
+
+def render(template_name, context=None, code=200, headers=None):
+    """Render a response using standard Nikola templates.
+
+    :param str template_name: Template name
+    :param dict context: Context (variables) to use in the template
+    :param int code: HTTP status code
+    :param headers: Headers to use for the response
+    :return: HTML fragment
+    :rtype: str
+    """
+    if context is None:
+        context = {}
+    if headers is None:
+        headers = {}
+
+    context['g'] = g
+    context['request'] = request
+    context['session'] = session
+    context['current_user'] = current_user
+    context['_author_get'] = _author_get
+    context['_author_uid_get'] = _author_uid_get
+
+    headers['Pragma'] = 'no-cache'
+    headers['Cache-Control'] = 'private, max-age=0, no-cache'
+
+    return site.render_template(template_name, None, context), code, headers
+
+
+def error(desc, code, permalink):
+    """Render an error page.
+
+    :param str desc: Error description
+    :param int code: HTTP status code
+    :param str permalink: Path to page generating errors
+    :return: HTML fragment (from :func:`render`)
+    :rtype: str
+    """
+    return render('comet_error.tmpl',
+                  {'title': 'Error',
+                   'code': code,
+                   'desc': desc,
+                   'permalink': permalink},
+                  code)
+
+
+def _unauthorized():
+    """Redirect to the “unauthorized” page."""
+    return redirect('/login?status=unauthorized')
+
+
+def find_post(path):
+    """Find a post.
+
+    :param str path: Path to the post
+    :return: A post matching the path
+    :rtype: Post or None
+    """
+    for p in site.timeline:
+        if p.source_path == path:
+            return p
+    return None
+
+
+app = Flask('comet')
+app.config['BCRYPT_LOG_ROUNDS'] = 12
+
+
+@app.after_request
+def log_request(resp):
+    """Log a request."""
+    l = "[{4}] {0} {1} {2} <{3}>".format(request.remote_addr, request.method,
+                                         request.url, request.endpoint,
+                                         resp.status_code)
+    c = str(resp.status_code)[0]
+    if c in ['1', '2'] or resp.status_code == 304:
+        app.http_logger.info(l)
+    elif c == '3':
+        app.http_logger.warn(l)
+    else:
+        app.http_logger.error(l)
+    return resp
+
+bcrypt = Bcrypt(app)
+login_manager = LoginManager()
+login_manager.init_app(app)
+login_manager.unauthorized_callback = _unauthorized
+PERMISSIONS = ['is_admin', 'can_edit_all_posts', 'wants_all_posts',
+               'can_upload_attachments', 'can_rebuild_site',
+               'can_transfer_post_authorship']
+
+
+class User(object):
+    """An user.  Compatible with Flask-Login."""
+    def __init__(self, uid, username, realname, password, active, is_admin,
+                 can_edit_all_posts, wants_all_posts,
+                 can_upload_attachments, can_rebuild_site,
+                 can_transfer_post_authorship):
+        """Initialize an user with specified settings."""
+        self.uid = uid
+        self.username = username
+        self.realname = realname
+        self.password = password
+        self.active = active
+        self.is_admin = is_admin
+        self.can_edit_all_posts = can_edit_all_posts
+        self.wants_all_posts = wants_all_posts
+        self.can_upload_attachments = can_upload_attachments
+        self.can_rebuild_site = can_rebuild_site
+        self.can_transfer_post_authorship = can_transfer_post_authorship
+
+    def get_id(self):
+        """Get user ID."""
+        return unicode_str(self.uid)
+
+    def is_authenticated(self):
+        """Check whether user is authorized to log in."""
+        return self.active
+
+    def is_active(self):
+        """Check whether user is active."""
+        return self.active
+
+    def is_anonymous(self):
+        """Check whether user is anonymous."""
+        return not self.active
+
+    def get_auth_token(self):
+        """Generate an authentication token."""
+        return make_secure_token(self.uid, self.username, self.password)
+
+    def __repr__(self):
+        """Return a programmer-friendly representation."""
+        return '<User {0}>'.format(self.username)
+
+
+@login_manager.user_loader
+def get_user(uid):
+    """Get an user by the UID.
+
+    :param str uid: UID to find
+    :return: the user
+    :rtype: User object
+    :raises ValueError: uid is not an integer
+    :raises KeyError: if user does not exist
+    """
+    return app.config['USERS'][int(uid)]
+
+
+def find_user_by_name(username):
+    """Get an user by their username.
+
+    :param str username: Username to find
+    :return: the user
+    :rtype: User object or None
+    """
+    for uid, u in app.config['USERS'].items():
+        if u.username == username:
+            return u
+            break
+
+
+def read_users():
+    """Read user data from the JSON file."""
+    app.config['USERS'] = {}
+
+    if not os.path.exists(app.config['USERS_PATH']):
+        raise Exception("Cannot find comet_users.json.")
+
+    with io.open(app.config['USERS_PATH'], 'r', encoding='utf-8') as fh:
+        udict = json.load(fh)
+    for uid, data in udict.items():
+        uid = int(uid)
+        app.config['USERS'][uid] = User(uid, **data)
+
+
+def write_users():
+    """Write user data to the JSON file."""
+    udict = {}
+    for uid, user in app.config['USERS'].items():
+        uid = unicode_str(uid)
+        udict[uid] = {
+            'username': user.username,
+            'realname': user.realname,
+            'password': user.password,
+            'active': user.active,
+        }
+        for p in PERMISSIONS:
+            udict[uid][p] = getattr(user, p)
+    with open(app.config['USERS_PATH'], 'w') as fh:
+        json.dump(udict, fh, indent=4, sort_keys=True, separators=(',', ': '))
+
+
+@app.route('/login', methods=['GET', 'POST'])
+def login():
+    """Handle user authentication.
+
+    If requested over GET, present login page.
+    If requested over POST, log user in.
+
+    :param str status: Status of previous request/login attempt
+    """
+    alert = None
+    alert_status = 'danger'
+    code = 200
+    if request.method == 'POST':
+        user = find_user_by_name(request.form['username'])
+        if not user:
+            alert = 'Invalid credentials.'
+            code = 401
+        else:
+            if check_password(user.password,
+                              request.form['password']) and user.active:
+                login_user(user, remember=('remember-me' in request.form))
+                return redirect('/')
+            else:
+                alert = "Invalid credentials."
+                code = 401
+    else:
+        if request.args.get('status') == 'unauthorized':
+            alert = 'Please log in to access this page.'
+        elif request.args.get('status') == 'logout':
+            alert = 'Logged out successfully.'
+            alert_status = 'success'
+    return render('comet_login.tmpl', {'title': 'Login', 'permalink': '/login',
+                                       'alert': alert,
+                                       'alert_status': alert_status}, code)
+
+
+@app.route('/logout')
+@login_required
+def logout():
+    """Log the user out and redirect them to the login page."""
+    logout_user()
+    return redirect('/login?status=logout')
+
+
+@app.route('/')
+@login_required
+def index():
+    """Show the index with all posts.
+
+    :param int all: Whether or not should show all posts
+    """
+    if not os.path.exists(os.path.join(site.config["OUTPUT_FOLDER"],
+                                       'assets')):
+        return redirect('/setup')
+
+    context = {}
+
+    n = request.args.get('all')
+    if n is None:
+        wants_now = None
+    else:
+        wants_now = n == '1'
+
+    if wants_now is None and current_user.wants_all_posts:
+        wants = True
+    else:
+        wants = wants_now
+
+    if current_user.can_edit_all_posts and wants:
+        posts = site.posts
+        pages = site.pages
+    else:
+        wants = False
+        posts = []
+        pages = []
+        for p in site.timeline:
+            if (p.meta('author.uid')
+                    and p.meta('author.uid') != str(current_user.uid)):
+                continue
+            if p.use_in_feeds:
+                posts.append(p)
+            else:
+                pages.append(p)
+
+    context['posts'] = posts
+    context['pages'] = pages
+    context['title'] = 'Posts & Pages'
+    context['permalink'] = '/'
+    context['wants'] = wants
+    return render('comet_index.tmpl', context)
+
+
+# TODO: delete (with redirects) as soon as `comet init` and real docs exist
+@app.route('/setup')
+def setup():
+    """TEMPORARY setup function."""
+    ns = not os.path.exists(os.path.join(site.config["OUTPUT_FOLDER"],
+                                         'assets'))
+    return render("comet_setup.tmpl", context={'needs_setup': ns})
+
+
+@app.route('/edit/<path:path>', methods=['GET', 'POST'])
+@login_required
+def edit(path):
+    """Edit a post.
+
+    If requested over GET, shows the edit UI.
+    If requested over POST, saves the post and shows the edit UI.
+
+    :param path: Path to post to edit.
+    """
+    context = {'path': path, 'site': site}
+    post = find_post(path)
+    if post is None:
+        return error("No such post or page.", 404, '/edit/' + path)
+
+    if request.method == 'POST':
+        meta = {}
+        for k, v in request.form.items():
+            meta[k] = v
+        meta.pop('_wysihtml5_mode', '')
+        try:
+            meta['author'] = get_user(int(meta['author.uid'])).realname
+            author_change_success = True
+        except:
+            author_change_success = False
+        if (not current_user.can_transfer_post_authorship
+                or not author_change_success):
+            meta['author'] = post.meta('author') or current_user.realname
+            meta['author.uid'] = post.meta('author.uid') or current_user.uid
+        post.compiler.create_post(post.source_path, onefile=True,
+                                  is_page=False, **meta)
+        scan_site()
+        post = find_post(path)
+        context['action'] = 'save'
+        context['post_content'] = meta['content']
+    else:
+        context['action'] = 'edit'
+        with io.open(path, 'r', encoding='utf-8') as fh:
+            context['post_content'] = fh.read().split('\n\n', 1)[1]
+
+    context['post'] = post
+    safe_users = []
+    for u in app.config['USERS'].values():
+        safe_users.append((u.uid, u.realname))
+    context['USERS'] = sorted(safe_users)
+    context['current_auid'] = int(post.meta('author.uid') or current_user.uid)
+    context['title'] = 'Editing {0}'.format(post.title())
+    context['permalink'] = '/edit/' + path
+    return render('comet_post_edit.tmpl', context)
+
+
+@app.route('/delete', methods=['POST'])
+@login_required
+def delete():
+    """Delete a post."""
+    path = request.form['path']
+    for p in site.timeline:
+        if p.source_path == path:
+            post = p
+            break
+    if post is None:
+        return error("No such post or page.", 404, '/delete')
+    os.unlink(path)
+    scan_site()
+    return redirect('/')
+
+
+
+@app.route('/rebuild')
+@login_required
+def rebuild():
+    """Rebuild the site."""
+    return "<h1>Not implemented.</h1>", 500
+
+
+@app.route('/rescan')
+@login_required
+def rescan():
+    """Rescan posts."""
+    scan_site()
+    return redirect('/')
+
+@app.route('/wysihtml/<path:path>')
+def serve_wysihtml(path):
+    """Serve wysihtml files.
+
+    This is meant to be used ONLY by the internal dev server.
+    Please configure your web server to handle requests to this URL::
+
+        /wysihtml/ => comet/data/bower_components/wysihtml
+    """
+    res = pkg_resources.resource_filename(
+        'comet', os.path.join('data', 'bower_components', 'wysihtml'))
+    return send_from_directory(res, path)
+
+
+@app.route('/comet_assets/<path:path>')
+def serve_comet_assets(path):
+    """Serve Comet assets.
+
+    This is meant to be used ONLY by the internal dev server.
+    Please configure your web server to handle requests to this URL::
+
+        /comet_assets/ => comet/data/comet_assets
+    """
+    res = pkg_resources.resource_filename(
+        'comet', os.path.join('data', 'comet_assets'))
+    return send_from_directory(res, path)
+
+
+@app.route('/assets/<path:path>')
+def serve_assets(path):
+    """Serve Nikola assets.
+
+    This is meant to be used ONLY by the internal dev server.
+    Please configure your web server to handle requests to this URL::
+
+        /assets/ => output/assets
+    """
+    res = os.path.join(app.config['NIKOLA_ROOT'],
+                       site.config["OUTPUT_FOLDER"], 'assets')
+    return send_from_directory(res, path)
+
+
+@app.route('/new/<obj>', methods=['POST'])
+@login_required
+def new(obj):
+    """Create a new post or page.
+
+    :param str obj: Object to create (post or page)
+    """
+    title = request.form['title']
+    site.config['ADDITIONAL_METADATA']['author.uid'] = current_user.uid
+    try:
+        if obj == 'post':
+            site.commands.new_post(title=title, author=current_user.realname,
+                                   content_format='html')
+        elif obj == 'page':
+            site.commands.new_page(title=title, author=current_user.realname,
+                                   content_format='html')
+        else:
+            return error("Cannot create {0} — unknown type.".format(obj),
+                         400, '/new/' + obj)
+    except SystemExit:
+        return error("This {0} already exists!".format(obj),
+                     500, '/new/' + obj)
+    finally:
+        del site.config['ADDITIONAL_METADATA']['author.uid']
+    # reload post list and go to index
+    scan_site()
+    return redirect('/')
+
+
+@app.route('/account', methods=['POST', 'GET'])
+@login_required
+def acp_user_account():
+    """Manage the user account of currently-logged-in users.
+
+    This does NOT accept admin-specific options.
+    """
+    alert = ''
+    alert_status = ''
+    action = 'edit'
+    if request.method == 'POST':
+        action = 'save'
+        data = request.form
+        if data['newpwd1']:
+            if data['newpwd1'] == data['newpwd2'] and check_password(
+                    current_user.password, data['oldpwd']):
+                current_user.password = password_hash(data['newpwd1'])
+            else:
+                alert = 'Passwords don’t match.'
+                alert_status = 'danger'
+                action = 'save_fail'
+        current_user.realname = data['realname']
+        current_user.wants_all_posts = 'wants_all_posts' in data
+        write_users()
+
+    return render('comet_account.tmpl',
+                  context={'title': 'My account',
+                           'permalink': '/account',
+                           'action': action,
+                           'alert': alert,
+                           'alert_status': alert_status})
+
+
+@app.route('/users')
+@login_required
+def acp_users():
+    """List all users."""
+    alert = ''
+    alert_status = ''
+    if request.args.get('status') == 'deleted':
+        alert = 'User deleted.'
+        alert_status = 'success'
+    if request.args.get('status') == 'undeleted':
+        alert = 'User undeleted.'
+        alert_status = 'success'
+    if not current_user.is_admin:
+        return error("Not authorized to edit users.", 401, "/users")
+    else:
+        return render('comet_users.tmpl',
+                      context={'title': 'Users',
+                               'permalink': '/users',
+                               'USERS': app.config['USERS'],
+                               'alert': alert,
+                               'alert_status': alert_status})
+
+
+@app.route('/users/edit', methods=['POST'])
+@login_required
+def acp_users_edit():
+    """Edit an user account."""
+    if not current_user.is_admin:
+        return error("Not authorized to edit users.", 401, "/users/edit")
+    data = request.form
+    action = data['action']
+
+    if action == 'new':
+        uid = max(app.config['USERS']) + 1
+        app.config['USERS'][uid] = User(uid, data['username'], '', '', True,
+                                        False, True, True, True, True)
+        user = app.config['USERS'][uid]
+        new = True
+    else:
+        user = get_user(data['uid'])
+        new = False
+
+    if not user:
+        return error("User does not exist.", 404, "/users/edit")
+
+    alert = ''
+    alert_status = ''
+
+    if action == 'save':
+        if data['newpwd1']:
+            if data['newpwd1'] == data['newpwd2']:
+                user.password = password_hash(data['newpwd1'])
+            else:
+                alert = 'Passwords don’t match.'
+                alert_status = 'danger'
+                action = 'save_fail'
+        elif new:
+            alert = 'Must set a password.'
+            alert_status = 'danger'
+            action = 'save_fail'
+        user.realname = data['realname']
+        for p in PERMISSIONS:
+            setattr(user, p, p in data)
+        if user == current_user:
+            user.is_admin = True
+
+        write_users()
+
+    return render('comet_users_edit.tmpl',
+                  context={'title': 'Edit user',
+                           'permalink': '/users/edit',
+                           'user': user,
+                           'new': new,
+                           'action': action,
+                           'alert': alert,
+                           'alert_status': alert_status})
+
+
+@app.route('/users/delete', methods=['POST'])
+@login_required
+def acp_users_delete():
+    """Delete or undelete an user account."""
+    if not current_user.is_admin:
+        return error("Not authorized to edit users.", 401, "/users/delete")
+    user = get_user(int(request.form['uid']))
+    direction = request.form['direction']
+    if not user:
+        return error("User does not exist.", 404, "/users/edit/delete")
+    else:
+        user.active = direction == 'undel'
+        for p in PERMISSIONS:
+            setattr(user, p, False)
+        write_users()
+        return redirect('/users?status={_del}eted'.format(_del=direction))
+
+
+@app.route('/users/permissions', methods=['GET', 'POST'])
+@login_required
+def acp_users_permissions():
+    """Change user permissions."""
+    if not current_user.is_admin:
+        return error("Not authorized to edit users.",
+                     401, "/users/permissions")
+
+    if request.method == 'POST':
+        for uid, user in app.config['USERS'].items():
+            for perm in PERMISSIONS:
+                if '{0}.{1}'.format(uid, perm) in request.form:
+                    setattr(user, perm, True)
+                else:
+                    setattr(user, perm, False)
+        current_user.is_admin = True  # cannot deadmin oneself
+        action = 'save'
+        write_users()
+    else:
+        action = 'edit'
+
+    def display_permission(user, permission):
+        checked = 'checked' if getattr(user, permission) else ''
+        if permission == 'wants_all_posts' and not user.can_edit_all_posts:
+            # If this happens, permissions are damaged.
+            checked = ''
+        if user == current_user and permission == 'is_admin':
+            disabled = 'disabled'
+        else:
+            disabled = ''
+        d = ('<input type="checkbox" name="{0}.{1}" data-uid="{0}" '
+             'data-perm="{1}" class="u{0}" {2} {3}>')
+        return d.format(user.uid, permission, checked, disabled)
+
+    return render('comet_users_permissions.tmpl',
+                  context={'title': 'Permissions',
+                           'permalink': '/users/permissions',
+                           'USERS': app.config['USERS'],
+                           'PERMISSIONS': PERMISSIONS,
+                           'action': action,
+                           'json': json,
+                           'display_permission': display_permission})
diff --git a/requirements.txt b/requirements.txt
index 2a5c0ec..654e239 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,5 @@
 Nikola
+docopt==0.6.1
 Flask==0.10.1
 Flask-Login==0.2.11
 Flask-Bcrypt==0.6.0
diff --git a/setup.py b/setup.py
index 9ed4f35..b56728c 100755
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
 import io
 from setuptools import setup
 
-setup(name='comet_cms',
+setup(name='comet-cms',
       version='0.6.0',
       description='Getting rid of the dinosaurs (WordPress and friends).',
       keywords='comet',
@@ -26,7 +26,7 @@
       include_package_data=True,
       entry_points={
           'console_scripts': [
-              'comet = comet:main',
+              'comet = comet.__main__:main',
           ]
       },
       )