Merge branch 'master' into devel

Author: oprypin

.gitignore

@@ -12,4 +12,4 @@
 !/src/private
 !/test
 !/examples
-!/circle.yml
+!/.travis.yml

.travis.yml

@@ -0,0 +1,38 @@
+language: c
+before_install:
+  - |
+    if [ "$TRAVIS_BRANCH" = master ]; then
+        export branch=master
+    else
+        export branch=devel
+    fi
+install:
+  - |
+    if [ ! -x nim-$branch/bin/nim ]; then
+      git clone -b $branch --depth 1 git://github.com/nim-lang/nim nim-$branch/
+      cd nim-$branch
+      git clone -b $branch --depth 1 git://github.com/nim-lang/csources csources/
+      cd csources
+      sh build.sh
+      cd ..
+      rm -rf csources
+      bin/nim c koch
+      ./koch boot -d:release
+      cd ..
+    else
+      cd nim-$branch
+      git fetch origin
+      if ! git merge FETCH_HEAD | grep "Already up-to-date"; then
+        bin/nim c koch
+        ./koch boot -d:release
+      fi
+      cd ..
+    fi
+before_script:
+  - export PATH=nim-$branch/bin:$PATH
+script:
+  - nim compile --verbosity:0 --run test/test
+cache:
+  directories:
+    - nim-master
+    - nim-devel

README.md

@@ -3,7 +3,7 @@
 
 **This is a port of [docopt][docopt.py] to [Nim][]. Visit [docopt.org][] for more information.**
 
-[![Build Status](https://circleci.com/gh/docopt/docopt.nim.png?style=shield)](https://circleci.com/gh/docopt/docopt.nim)
+[![Build Status](https://api.travis-ci.org/docopt/docopt.nim.svg?branch=master)](https://travis-ci.org/docopt/docopt.nim)
 
 ```nim
 let doc = """