Merge branch 'testing' into master

CONTRIBUTING

@@ -0,0 +1,15 @@
+Issues and Pull Requests are always welcome. Thank you for your contribution!
+
+# Reporting an Issue
+Please check the latest development version to see if your issue has been fixed since the latest stable release.
+
+# Test Suite
+There is a `decoding_test.py` script in the `tests/` directory which acts as a harness in order to allow toml to be used with [the toml test suite](https://github.com/uiri/toml-test), written (unfortunately) in Go.
+
+## Usage
+1. Install Go (golang)
+2. The toml-test suite
+	1. [Instructions](https://github.com/BurntSushi/toml-test#try-it-out)
+3. Test both versions of Python:
+	* `~/go/bin/toml-test ./tests/decoding_test2.sh` - for Python 2
+	* `~/go/bin/toml-test ./tests/decoding_test3.sh` - for Python 3

TESTING

@@ -1 +0,0 @@
-There is a toml_test.py script which acts as a harness in order to allow toml to be used with [BurntSushi's toml test suite](https://github.com/BurntSushi/toml-test), written in Go. Usage means installing go, the toml-test suite and running the toml-test go binary with toml_test.py as its argument. Modification of tests should happen in BurntSushi's repository. For testing python3 (rather than python2), the toml_test3.py script should be used instead.

tests/example_test.py

@@ -1,12 +0,0 @@
-#!/usr/bin/env python
-"""Decodes toml and outputs it as JSON"""
-
-import toml_test
-import toml
-import sys
-import json
-
-if __name__ == '__main__':
-    tdata = toml.loads(sys.stdin.detach().read().decode('utf-8'))
-    tagged = toml_test.tag(tdata)
-    print(json.dumps(tagged))