From 50a201a018e874e025ebfdab11e401d79e31dbb2 Mon Sep 17 00:00:00 2001
From: "Anders S. Christensen" <andersx@nano.ku.dk>
Date: Fri, 9 Jun 2017 14:57:28 +0200
Subject: [PATCH 01/21] Updated travis yml

---
 .travis.yml | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index afbbe6c82..09e42ea23 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,11 +3,12 @@ language: python
 sudo: required
 dist: trusty
 
+deploy:
+  provider: pages
+  skip_cleanup: true
+
 python:
   - "2.7"
-  - "3.4"
-  - "3.5"
-  - "3.6"
 
 before_install:
   - sudo apt-get update -qq
@@ -22,15 +23,33 @@ install:
        python3 setup.py install
    elif [ ${TRAVIS_PYTHON_VERSION} = "2.7" ]; then
        sudo apt-get install python-numpy
+       python2 setup.py build
        python2 setup.py install
 
    else
        echo "ERROR: Unknown Python version."
    fi
 
+   cd ${TRAVIS_BUILD_DIR}/docs
+   make html
+
 
 before_script:
  - cd ${TRAVIS_BUILD_DIR}/tests/
 
 script:
  - nosetests -v
+
+after_success: 
+ - |
+   cd ${TRAVIS_BUILD_DIR}/docs/
+
+   git init
+   git checkout -b gh-pages
+   git add .
+   git -c user.name='travis' -c user.email='travis' commit -m init
+
+   # Make sure to make the output quiet, or else the API token will leak!
+   # This works because the API key can replace your password.
+   git push -f -q https://andersx:$GH_TOKEN@github.com/qmlcode/qmlcode.github.io gh-pages 
+   cd "$TRAVIS_BUILD_DIR"

From 53dca660ebc6bf9f0c01743b0eb6a73699632b5d Mon Sep 17 00:00:00 2001
From: "Anders S. Christensen" <andersx@nano.ku.dk>
Date: Fri, 9 Jun 2017 15:00:35 +0200
Subject: [PATCH 02/21] Updated travis yml

---
 .travis.yml | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 09e42ea23..9c48cf030 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,12 @@ dist: trusty
 deploy:
   provider: pages
   skip_cleanup: true
+deploy:
+  provider: pages
+  skip_cleanup: true
+  github_token: $GH_TOKEN # Set in travis-ci.org dashboard
+  on:
+    branch: documentation
 
 python:
   - "2.7"
@@ -17,18 +23,9 @@ install:
  - sudo apt-get install -qq gcc gfortran libblas-dev liblapack-dev
  - sudo apt-get install -qq gcc-4.8 gfortran-4.8
 
- - |
-   if [ ${TRAVIS_PYTHON_VERSION:0:1} = 3 ]; then
-       sudo apt-get install python3-numpy
-       python3 setup.py install
-   elif [ ${TRAVIS_PYTHON_VERSION} = "2.7" ]; then
-       sudo apt-get install python-numpy
-       python2 setup.py build
-       python2 setup.py install
-
-   else
-       echo "ERROR: Unknown Python version."
-   fi
+ - sudo apt-get install python-numpy
+ - python2 setup.py build
+ - python2 setup.py install
 
    cd ${TRAVIS_BUILD_DIR}/docs
    make html

From 0003649f1829a05bf64f8d17b01b7a6c3ef3dd5d Mon Sep 17 00:00:00 2001
From: "Anders S. Christensen" <andersx@nano.ku.dk>
Date: Fri, 9 Jun 2017 15:01:44 +0200
Subject: [PATCH 03/21] Updated travis yml

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 9c48cf030..dbfd1c046 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,6 +24,8 @@ install:
  - sudo apt-get install -qq gcc-4.8 gfortran-4.8
 
  - sudo apt-get install python-numpy
+ - pip2 install sphinx
+ - pip2 install sphinx-rtd-theme
  - python2 setup.py build
  - python2 setup.py install
 

From 2ca39f3471d6c6b88ea0751458b5047c71d731e9 Mon Sep 17 00:00:00 2001
From: "Anders S. Christensen" <andersx@nano.ku.dk>
Date: Fri, 9 Jun 2017 16:20:23 +0200
Subject: [PATCH 04/21] Updated travis yml

---
 .travis.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dbfd1c046..73b5e9d35 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,9 +3,6 @@ language: python
 sudo: required
 dist: trusty
 
-deploy:
-  provider: pages
-  skip_cleanup: true
 deploy:
   provider: pages
   skip_cleanup: true

From 103db828fb6ed2a2296e36d6652a1139dc2d30e3 Mon Sep 17 00:00:00 2001
From: "Anders S. Christensen" <andersx@nano.ku.dk>
Date: Fri, 9 Jun 2017 17:02:31 +0200
Subject: [PATCH 05/21] Updated travis yml

---
 .travis.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 73b5e9d35..3845d9f6e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,8 +38,8 @@ script:
 
 after_success: 
  - |
-   cd ${TRAVIS_BUILD_DIR}/docs/
-
+   cd ${TRAVIS_BUILD_DIR}/docs/html
+   pwd
    git init
    git checkout -b gh-pages
    git add .
@@ -47,5 +47,8 @@ after_success:
 
    # Make sure to make the output quiet, or else the API token will leak!
    # This works because the API key can replace your password.
-   git push -f -q https://andersx:$GH_TOKEN@github.com/qmlcode/qmlcode.github.io gh-pages 
+   git push -f -q https://${GH_TOKEN}@github.com/qmlcode/qmlcode.github.io.git gh-pages 
    cd "$TRAVIS_BUILD_DIR"
+
+notifications:
+  email: false

From 397e664c59a6535cab8bc8a77ec64f488e7c8230 Mon Sep 17 00:00:00 2001
From: "Anders S. Christensen" <andersx@nano.ku.dk>
Date: Fri, 9 Jun 2017 17:07:20 +0200
Subject: [PATCH 06/21] Updated travis yml

---
 .travis.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3845d9f6e..0db654fed 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,15 +19,13 @@ before_install:
 install:
  - sudo apt-get install -qq gcc gfortran libblas-dev liblapack-dev
  - sudo apt-get install -qq gcc-4.8 gfortran-4.8
-
  - sudo apt-get install python-numpy
  - pip2 install sphinx
  - pip2 install sphinx-rtd-theme
  - python2 setup.py build
  - python2 setup.py install
-
-   cd ${TRAVIS_BUILD_DIR}/docs
-   make html
+ - cd ${TRAVIS_BUILD_DIR}/docs
+ - make html
 
 
 before_script:

From 13a6ab4ca17454d5daa01255d70872c56cf3c75b Mon Sep 17 00:00:00 2001
From: "Anders S. Christensen" <andersx@nano.ku.dk>
Date: Fri, 9 Jun 2017 17:13:50 +0200
Subject: [PATCH 07/21] Updated travis yml

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 0db654fed..115290049 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,7 +36,7 @@ script:
 
 after_success: 
  - |
-   cd ${TRAVIS_BUILD_DIR}/docs/html
+   cd ${TRAVIS_BUILD_DIR}/docs/build/html
    pwd
    git init
    git checkout -b gh-pages

From 2a91fd21e9d8b9467f1968e8f946d2d5e06c2d63 Mon Sep 17 00:00:00 2001
From: "Anders S. Christensen" <andersx@nano.ku.dk>
Date: Fri, 9 Jun 2017 17:22:22 +0200
Subject: [PATCH 08/21] Updated travis yml

---
 .travis.yml | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 115290049..57df18be5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,8 @@ deploy:
   provider: pages
   skip_cleanup: true
   github_token: $GH_TOKEN # Set in travis-ci.org dashboard
+  local_dir: docs/build/html
+  repo: qmlcode/qmlcode.github.io
   on:
     branch: documentation
 
@@ -34,19 +36,5 @@ before_script:
 script:
  - nosetests -v
 
-after_success: 
- - |
-   cd ${TRAVIS_BUILD_DIR}/docs/build/html
-   pwd
-   git init
-   git checkout -b gh-pages
-   git add .
-   git -c user.name='travis' -c user.email='travis' commit -m init
-
-   # Make sure to make the output quiet, or else the API token will leak!
-   # This works because the API key can replace your password.
-   git push -f -q https://${GH_TOKEN}@github.com/qmlcode/qmlcode.github.io.git gh-pages 
-   cd "$TRAVIS_BUILD_DIR"
-
 notifications:
   email: false

From d114475bbe3e71f55735fc0604d6ce9d726039a5 Mon Sep 17 00:00:00 2001
From: "Anders S. Christensen" <andersx@nano.ku.dk>
Date: Fri, 9 Jun 2017 17:27:36 +0200
Subject: [PATCH 09/21] Updated travis yml

---
 .travis.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 57df18be5..686b4d8ef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,8 +7,6 @@ deploy:
   provider: pages
   skip_cleanup: true
   github_token: $GH_TOKEN # Set in travis-ci.org dashboard
-  local_dir: docs/build/html
-  repo: qmlcode/qmlcode.github.io
   on:
     branch: documentation
 
@@ -36,5 +34,9 @@ before_script:
 script:
  - nosetests -v
 
+after_success: 
+ - cd ${TRAVIS_BUILD_DIR}/docs/build/html
+ - pwd
+ - ls
 notifications:
   email: false

From 2fa1651f599d87a309b4d58ae6d04c341e3e42fa Mon Sep 17 00:00:00 2001
From: "Anders S. Christensen" <andersx@nano.ku.dk>
Date: Fri, 9 Jun 2017 17:34:15 +0200
Subject: [PATCH 10/21] Updated travis yml

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 686b4d8ef..9f353e369 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,7 @@ dist: trusty
 deploy:
   provider: pages
   skip_cleanup: true
+  repo: qmlcode/qmlcode.github.io
   github_token: $GH_TOKEN # Set in travis-ci.org dashboard
   on:
     branch: documentation
@@ -38,5 +39,6 @@ after_success:
  - cd ${TRAVIS_BUILD_DIR}/docs/build/html
  - pwd
  - ls
+
 notifications:
   email: false

From c4e671bcae6d029d68d4bf85e06c0219bcc32f34 Mon Sep 17 00:00:00 2001
From: "Anders S. Christensen" <andersx@nano.ku.dk>
Date: Fri, 9 Jun 2017 17:37:43 +0200
Subject: [PATCH 11/21] Updated travis yml

---
 .travis.yml           | 1 +
 docs/source/index.rst | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 9f353e369..b0d62935a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,7 @@ deploy:
   provider: pages
   skip_cleanup: true
   repo: qmlcode/qmlcode.github.io
+  target_brangh: master
   github_token: $GH_TOKEN # Set in travis-ci.org dashboard
   on:
     branch: documentation
diff --git a/docs/source/index.rst b/docs/source/index.rst
index f2f262ec3..630d2f4fd 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -20,7 +20,7 @@ Current list of contributors:
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 -  Anders S. Christensen (University of Basel)
--  Felix Faber (University of Basel)
+-  Felix A. Faber (University of Basel)
 -  Bing Huang (University of Basel)
 -  Lars A. Bratholm (University of Copenhagen)
 -  Alexandre Tkatchenko (University of Luxembourg)

From b2b048bceb9aa661778318890dcb65dfe7fb38f5 Mon Sep 17 00:00:00 2001
From: "Anders S. Christensen" <andersx@nano.ku.dk>
Date: Fri, 9 Jun 2017 17:43:34 +0200
Subject: [PATCH 12/21] Updated travis yml

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index b0d62935a..217423860 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ deploy:
   provider: pages
   skip_cleanup: true
   repo: qmlcode/qmlcode.github.io
-  target_brangh: master
+    target_brangh: master
   github_token: $GH_TOKEN # Set in travis-ci.org dashboard
   on:
     branch: documentation

From cd4006e06396e60186c85e37e607cd2438cbf713 Mon Sep 17 00:00:00 2001
From: "Anders S. Christensen" <andersx@nano.ku.dk>
Date: Fri, 9 Jun 2017 17:48:34 +0200
Subject: [PATCH 13/21] Updated travis yml

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 217423860..a7e72eca7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ deploy:
   provider: pages
   skip_cleanup: true
   repo: qmlcode/qmlcode.github.io
-    target_brangh: master
+  target_branch: master
   github_token: $GH_TOKEN # Set in travis-ci.org dashboard
   on:
     branch: documentation

From ce9c325fa1ec233e7f725424e7ed134f3db5146c Mon Sep 17 00:00:00 2001
From: "Anders S. Christensen" <andersx@nano.ku.dk>
Date: Fri, 9 Jun 2017 17:52:01 +0200
Subject: [PATCH 14/21] Updated nojekyll

---
 docs/build/html/.nojekyll | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 docs/build/html/.nojekyll

diff --git a/docs/build/html/.nojekyll b/docs/build/html/.nojekyll
new file mode 100644
index 000000000..e69de29bb

From 6e4fd2ddec70e2166e88118d7cfb2972706cea85 Mon Sep 17 00:00:00 2001
From: "Anders S. Christensen" <andersx@nano.ku.dk>
Date: Fri, 9 Jun 2017 18:03:00 +0200
Subject: [PATCH 15/21] Updated nojekyll

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index a7e72eca7..15026366b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ dist: trusty
 
 deploy:
   provider: pages
+  local_dir: ${TRAVIS_BUILD_DIR}/docs/build/html
   skip_cleanup: true
   repo: qmlcode/qmlcode.github.io
   target_branch: master

From cf9fff876bf91cb783f802010138b3a55bb4c47d Mon Sep 17 00:00:00 2001
From: "Anders S. Christensen" <andersx@nano.ku.dk>
Date: Fri, 9 Jun 2017 18:03:11 +0200
Subject: [PATCH 16/21] Updated nojekyll

---
 .travis.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 15026366b..f4e90a73d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,10 +37,5 @@ before_script:
 script:
  - nosetests -v
 
-after_success: 
- - cd ${TRAVIS_BUILD_DIR}/docs/build/html
- - pwd
- - ls
-
 notifications:
   email: false

From cb02e5bc23e482a0e1f6c830664568bf5e242ba8 Mon Sep 17 00:00:00 2001
From: "Anders S. Christensen" <andersx@nano.ku.dk>
Date: Fri, 9 Jun 2017 18:13:17 +0200
Subject: [PATCH 17/21] Updated nojekyll

---
 .travis.yml | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f4e90a73d..a2a181324 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,9 @@ deploy:
 
 python:
   - "2.7"
+  - "3.4"
+  - "3.5"
+  - "3.6"
 
 before_install:
   - sudo apt-get update -qq
@@ -22,13 +25,24 @@ before_install:
 install:
  - sudo apt-get install -qq gcc gfortran libblas-dev liblapack-dev
  - sudo apt-get install -qq gcc-4.8 gfortran-4.8
- - sudo apt-get install python-numpy
- - pip2 install sphinx
- - pip2 install sphinx-rtd-theme
- - python2 setup.py build
- - python2 setup.py install
- - cd ${TRAVIS_BUILD_DIR}/docs
- - make html
+ 
+ - |
+   if [ ${TRAVIS_PYTHON_VERSION:0:1} = 3 ]; then
+       sudo apt-get install python3-numpy
+       python3 setup.py install
+   elif [ ${TRAVIS_PYTHON_VERSION} = "2.7" ]; then
+       sudo apt-get install python-numpy
+       python2 setup.py install
+       pip2 install sphinx
+       pip2 install sphinx-rtd-theme
+       python2 setup.py build
+       python2 setup.py install
+       cd ${TRAVIS_BUILD_DIR}/docs
+       make html
+
+   else
+       echo "ERROR: Unknown Python version."
+   fi
 
 
 before_script:

From c6b2a7cc27da8fcf70214d53608d3c4b4c1acf68 Mon Sep 17 00:00:00 2001
From: "Anders S. Christensen" <andersx@nano.ku.dk>
Date: Fri, 9 Jun 2017 18:16:51 +0200
Subject: [PATCH 18/21] Updated nojekyll

---
 .travis.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a2a181324..7b1eab7cd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,21 +25,23 @@ before_install:
 install:
  - sudo apt-get install -qq gcc gfortran libblas-dev liblapack-dev
  - sudo apt-get install -qq gcc-4.8 gfortran-4.8
- 
  - |
    if [ ${TRAVIS_PYTHON_VERSION:0:1} = 3 ]; then
        sudo apt-get install python3-numpy
+       python3 setup.py build
        python3 setup.py install
+       pip3 install sphinx
+       pip3 install sphinx-rtd-theme
+       cd ${TRAVIS_BUILD_DIR}/docs
+       make html
    elif [ ${TRAVIS_PYTHON_VERSION} = "2.7" ]; then
        sudo apt-get install python-numpy
+       python2 setup.py build
        python2 setup.py install
        pip2 install sphinx
        pip2 install sphinx-rtd-theme
-       python2 setup.py build
-       python2 setup.py install
        cd ${TRAVIS_BUILD_DIR}/docs
        make html
-
    else
        echo "ERROR: Unknown Python version."
    fi

From 74f86e828a504449912076686da2b7919a07aa7a Mon Sep 17 00:00:00 2001
From: "Anders S. Christensen" <andersx@nano.ku.dk>
Date: Fri, 9 Jun 2017 20:36:18 +0200
Subject: [PATCH 19/21] Updated nojekyll

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 7b1eab7cd..0eaae7b69 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,7 @@ deploy:
   github_token: $GH_TOKEN # Set in travis-ci.org dashboard
   on:
     branch: documentation
+    condition: ${TRAVIS_PYTHON_VERSION} = "3.6"
 
 python:
   - "2.7"

From c2cf94ca66de17a3fd9a91ccf044b2adb56efc90 Mon Sep 17 00:00:00 2001
From: "Anders S. Christensen" <andersx@nano.ku.dk>
Date: Fri, 9 Jun 2017 21:16:02 +0200
Subject: [PATCH 20/21] Updated travis yml

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0eaae7b69..e3c9fc850 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,10 +9,10 @@ deploy:
   skip_cleanup: true
   repo: qmlcode/qmlcode.github.io
   target_branch: master
-  github_token: $GH_TOKEN # Set in travis-ci.org dashboard
+  github_token: ${GH_TOKEN} # Set in travis-ci.org dashboard
   on:
     branch: documentation
-    condition: ${TRAVIS_PYTHON_VERSION} = "3.6"
+    condition: ${TRAVIS_PYTHON_VERSION} = "2.7"
 
 python:
   - "2.7"

From 31069260cfb58298d3769ac0964b683e57cf2a35 Mon Sep 17 00:00:00 2001
From: "Anders S. Christensen" <andersbiceps@gmail.com>
Date: Wed, 14 Jun 2017 10:22:37 +0200
Subject: [PATCH 21/21] Updated travis.yml

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e3c9fc850..ebd2e2206 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ deploy:
   target_branch: master
   github_token: ${GH_TOKEN} # Set in travis-ci.org dashboard
   on:
-    branch: documentation
+    branch: master
     condition: ${TRAVIS_PYTHON_VERSION} = "2.7"
 
 python: