diff --git a/README.md b/README.md
index d74426ab2b0e3..776dba4e3886f 100644
--- a/README.md
+++ b/README.md
@@ -2,4 +2,4 @@ Airflow
 ====
 Airflow is a system to programmaticaly author, schedule and monitor data pipelines. 
 
-[Documentation](http://airflow.readthedocs.org/en/latest/)
+[Documentation](http://pythonhosted.org/airflow/)
diff --git a/airflow/www/app.py b/airflow/www/app.py
index 8192ea52339f6..1dd37e9581eb4 100644
--- a/airflow/www/app.py
+++ b/airflow/www/app.py
@@ -554,20 +554,28 @@ def circles(self):
     @login_required
     def conf(self):
         from airflow import configuration
+        raw = request.args.get('raw') == "true"
         title = "Airflow Configuration"
         subtitle = configuration.AIRFLOW_CONFIG
         f = open(configuration.AIRFLOW_CONFIG, 'r')
+        config = f.read()
 
-        code_html = Markup(highlight(
-            f.read(),
-            IniLexer(),  # Lexer call
-            HtmlFormatter(noclasses=True))
-        )
         f.close()
-        return self.render(
-            'airflow/code.html',
-            pre_subtitle=settings.HEADER + "  v" + airflow.__version__,
-            code_html=code_html, title=title, subtitle=subtitle)
+        if raw:
+            return Response(
+                response=config,
+                status=200,
+                mimetype="application/text")
+        else:
+            code_html = Markup(highlight(
+                config,
+                IniLexer(),  # Lexer call
+                HtmlFormatter(noclasses=True))
+            )
+            return self.render(
+                'airflow/code.html',
+                pre_subtitle=settings.HEADER + "  v" + airflow.__version__,
+                code_html=code_html, title=title, subtitle=subtitle)
 
     @expose('/noaccess')
     def noaccess(self):