Fix build

- Fix semantic merge conflict in ruleDisableEnableTests.ts
- Remove redunant "next" content from README
- Small update to tslint.d.ts

README.md

@@ -9,14 +9,6 @@ TSLint
 
 A linter for the TypeScript language.
 
-"next" distribution
--------------------
-
-The `next` [branch of the TSLint repo](https://github.com/palantir/tslint/tree/next) tracks the latest TypeScript
-compiler and allows you to lint TS code that uses the latest features of the language. Releases from this branch
-are published to npm with the `next` dist-tag, so you can get the latest dev version of TSLint via
-`npm install tslint@next`.
-
 Installation
 ------------
 

lib/tslint.d.ts

@@ -252,10 +252,10 @@ declare module Lint {
         rulesDirectory: string;
     }
     class Linter {
+        static VERSION: string;
         private fileName;
         private source;
         private options;
-        static VERSION: string;
         constructor(fileName: string, source: string, options: ILinterOptions);
         lint(): LintResult;
         private getRelativePath(directory);

test/ruleDisableEnableTests.ts

@@ -24,7 +24,7 @@ describe("Enable and Disable Rules", () => {
             "quotemark": [true, "double"]
         }};
 
-        const relativePath = join("test", "files", "rules/enabledisable.test.ts");
+        const relativePath = join("test", "files", "enabledisable.test.ts");
         const source = readFileSync(relativePath, "utf8");
 
         const options: Lint.ILinterOptions = {