diff --git a/editor.html b/editor.html
deleted file mode 100644
index d4557f3b..00000000
--- a/editor.html
+++ /dev/null
@@ -1,274 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
-   "http://www.w3.org/TR/html4/strict.dtd">
-
-<html lang="en">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <title>Editor</title>
-    <meta name="author" content="Fabian Jakobs">
-    <link rel="stylesheet" href="demo/styles.css" type="text/css" media="screen" charset="utf-8">
-</head>
-<body>
-    <table id="controls">
-      <tr>
-      <td align="right">
-        <label for="doc">Document:</label>
-        <select id="doc" size="1">
-          <option value="js">JS Document</option>
-          <option value="html">HTML Document</option>
-          <option value="css">CSS Document</option>
-          <option value="python">Python Document</option>
-          <option value="php">PHP Document</option>
-          <option value="java">Java Document</option>
-          <option value="ruby">Ruby Document</option>
-          <option value="c_cpp">C++ Document</option>
-          <option value="coffee">CoffeeScript Document</option>
-          <option value="plain">Text Document</option>
-        </select>
-      </td>
-      <td align="right">
-        <label for="theme">Theme:</label>
-        <select id="theme" size="1">
-          <option value="ace/theme/textmate">TextMate</option>
-          <option value="ace/theme/eclipse">Eclipse</option>
-          <option value="ace/theme/dawn">Dawn</option>
-          <option value="ace/theme/idle_fingers">idleFingers</option>
-          <option value="ace/theme/pastel_on_dark">Pastel on dark</option>
-          <option value="ace/theme/twilight">Twilight</option>
-        </select>
-      </td>
-      <td align="right">
-        <label for="fontsize">Font Size:</label>
-        <select id="fontsize" size="1">
-          <option value="10px">10px</option>
-          <option value="11px">11px</option>
-          <option value="12px" selected="selected">12px</option>
-          <option value="14px">14px</option>
-          <option value="16px">16px</option>
-          <option value="20px">20px</option>
-          <option value="24px">24px</option>
-        </select>
-      </td>
-      <td align="right">
-        <label for="select_style">Full Line Selection</label>
-        <input type="checkbox" name="select_style" id="select_style" checked>
-      </td>
-      <td align="right">
-        <label for="highlight_active">Highlight Active Line</label>
-        <input type="checkbox" name="highlight_active" id="highlight_active" checked>
-      </td>
-      <td align="right">
-        <label for="show_hidden">Show Invisibles</label>
-        <input type="checkbox" name="show_hidden" id="show_hidden">
-      </td>
-      <td align="right" rowspan="2">
-        <img src="demo/logo.png">
-      </td>
-      </tr>
-      <tr>
-      <td align="right">
-        <label for="mode">Mode:</label>
-        <select id="mode" size="1">
-          <option value="text">Plain Text</option>
-          <option value="javascript">JavaScript</option>
-          <option value="xml">XML</option>
-          <option value="html">HTML</option>
-          <option value="css">CSS</option>
-          <option value="python">Python</option>
-          <option value="php">PHP</option>
-          <option value="java">Java</option>
-          <option value="ruby">Ruby</option>
-          <option value="c_cpp">C/C++</option>
-          <option value="coffee">CoffeeScript</option>
-        </select>
-      </td>
-      <td align="right">
-        <label for="keybinding">Key Binding:</label>
-        <select id="keybinding" size="1">
-          <option value="ace">Ace</option>
-          <option value="vim">Vim</option>
-          <option value="emacs">Emacs</option>
-          <option value="custom">Custom</option>
-        </select>
-      </td>
-      <td align="right">
-        <label for="soft_wrap">Soft Wrap:</label>
-        <select id="soft_wrap" size="1">
-          <option value="off">Off</option>
-          <option value="40">40 Chars</option>
-          <option value="80">80 Chars</option>
-          <option value="free">Free</option>
-        </select>
-      </td>
-      <td align="right">
-        <label for="show_gutter">Show Gutter</label>
-        <input type="checkbox" id="show_gutter" checked>
-      </td>
-      <td align="right">
-        <label for="show_print_margin">Show Print Margin</label>
-        <input type="checkbox" id="show_print_margin" checked>
-      </td>
-      </tr>
-    </table>
-
-    <div id="editor">
-    </div>
-
-    <script type="text/editor" id="jstext">function foo(items) {
-    for (var i=0; i<items.length; i++) {
-        alert(items[i] + "juhu");
-    }
-}
-// A magic character: >> ぁ <<
-</script>
-
-    <script type="text/editor" id="csstext">.text-layer {
-    font-family: Monaco, "Courier New", monospace;
-    font-size: 12px;
-    cursor: text;
-}</script>
-
-    <script type="text/editor" id="htmltext"><html>
-<head>
-
-<style type="text/css">
-.text-layer {
-    font-family: Monaco, "Courier New", monospace;
-    font-size: 12px;
-    cursor: text;
-}
-</style>
-
-</head>
-<body>
-    <h1 style="color:red">Juhu Kinners</h1>
-</body>
-</html></script>
-
-    <script type="text/editor" id="javatext">public class InfiniteLoop {
-        
-    /*
-     * This will cause the program to hang...
-     * 
-     * Taken from:
-     * http://www.exploringbinary.com/java-hangs-when-converting-2-2250738585072012e-308/
-     */
-    public static void main(String[] args) {
-        double d = Double.parseDouble("2.2250738585072012e-308");
-          
-        // unreachable code
-        System.out.println("Value: " + d);
-    }
-}</script>
-
-    <script type="text/editor" id="pythontext">#!/usr/local/bin/python
-
-import string, sys
-
-# If no arguments were given, print a helpful message
-if len(sys.argv)==1:
-    print 'Usage: celsius temp1 temp2 ...'
-    sys.exit(0)
-
-# Loop over the arguments
-for i in sys.argv[1:]:
-    try:
-        fahrenheit=float(string.atoi(i))
-    except string.atoi_error:
-        print repr(i), "not a numeric value"
-    else:
-        celsius=(fahrenheit-32)*5.0/9.0
-        print '%i\260F = %i\260C' % (int(fahrenheit), int(celsius+.5))
-</script>
-
-    <script type="text/editor" id="phptext"><?php
-
-function nfact($n) {
-  if ($n == 0) {
-    return 1;
-  }
-  else {
-    return $n * nfact($n - 1);
-  }
-}
-
-echo "\n\nPlease enter a whole number ... ";
-$num = trim(fgets(STDIN));
-
-// ===== PROCESS - Determing the factorial of the input number =====
-$output = "\n\nFactorial " . $num . " = " . nfact($num) . "\n\n";
-echo $output;
-
-?></script>
-
-  <script type="text/editor" id="plaintext">Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
-
-Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.
-
-Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.
-
-Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat.
-
-Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis.
-
-At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, At accusam aliquyam diam diam dolore dolores duo eirmod eos erat, et nonumy sed tempor et et invidunt justo labore Stet clita ea et gubergren, kasd magna no rebum. sanctus sea sed takimata ut vero voluptua. est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur
-</script>
-
-    <script type="text/editor" id="rubytext">#!/usr/bin/ruby
-    
-# Program to find the factorial of a number
-def fact(n)
-    if n == 0
-        1
-    else
-        n * fact(n-1)
-    end
-end
-
-puts fact(ARGV[0].to_i)
-</script>
-
-<script type="text/editor" id="cpptext">// compound assignment operators
-
-#include <iostream>
-using namespace std;
-
-int main ()
-{
-    int a, b=3; /* foobar */
-    a = b;
-    a+=2; // equivalent to a=a+2
-    cout << a;
-    return 0;
-}
-</script>
-
-<script type="text/editor" id="coffeetext">#!/usr/bin/env coffee
-
-try
-    throw URIError decodeURI(0xC0ffee * 123456.7e-8 / .9)
-catch e
-    console.log 'qstring' + "qqstring" + '''
-        qdoc
-    ''' + """
-        qqdoc
-    """
-
-do ->
-    ###
-    herecomment
-    ###
-    re = /regex/imgy.test ///
-        heregex  # comment
-    ///imgy
-    this isnt: `just JavaScript`
-    undefined
-
-var illegal</script>
-
-  <input id="cockpitInput" type="text"/>
-
-  <script src="demo/require.js" type="text/javascript" charset="utf-8"></script>
-  <script src="demo/boot.js" type="text/javascript"></script>
-</body>
-</html>
diff --git a/lib/ace/mode/php_highlight_rules.js b/lib/ace/mode/php_highlight_rules.js
index 0b4b4b48..374ad92e 100644
--- a/lib/ace/mode/php_highlight_rules.js
+++ b/lib/ace/mode/php_highlight_rules.js
@@ -472,6 +472,10 @@ PhpHighlightRules = function() {
                 token : "comment",
                 regex : "\\/\\/.*$"
             },
+            {
+               token : "comment",
+               regex : "#.*$"
+            },
             docComment.getStartRule("doc-start"),
             {
                 token : "comment", // multi line comment

- Document: - -	- Theme: - -	- Font Size: - -	- Full Line Selection - -	- Highlight Active Line - -	- Show Invisibles - -	- -
- Mode: - -	- Key Binding: - -	- Soft Wrap: - -	- Show Gutter - -	- Show Print Margin - -		- -