Merge cookiecutter template customisations into master

MANIFEST.in

@@ -16,4 +16,4 @@ include README.rst
 
 include tox.ini .travis.yml appveyor.yml
 
-global-exclude *.py[cod] __pycache__ *.so *.dylib
+global-exclude *.py[cod] __pycache__ *.so *.dylib *.swp

ci/appveyor-bootstrap.py

@@ -40,8 +40,9 @@
 
 def download_file(url, path):
     print("Downloading: {} (into {})".format(url, path))
+    progress = [0, 0]
 
-    def report(count, size, total, progress=[0, 0]):
+    def report(count, size, total):
         progress[0] = count * size
         if progress[0] - progress[1] > 1000000:
             progress[1] = progress[0]

setup.cfg

@@ -32,7 +32,7 @@ addopts =
     --tb=short
 
 [isort]
-force_single_line = True
+force_single_line = False
 line_length = 79
 known_first_party = oemof.tabular
 default_section = THIRDPARTY
@@ -42,6 +42,7 @@ skip = migrations
 ignore_whitespace = True
 known_oemof = oemof
 sections=FUTURE,STDLIB,THIRDPARTY,OEMOF,FIRSTPARTY,LOCALFOLDER
+from_first = True
 
 [matrix]
 # This is the configuration for the `./bootstrap.py` script.

setup.py

@@ -1,18 +1,13 @@
 #!/usr/bin/env python
 # -*- encoding: utf-8 -*-
-from __future__ import absolute_import
-from __future__ import print_function
+from __future__ import absolute_import, print_function
 
+from glob import glob
+from os.path import basename, dirname, join, splitext
 import io
 import re
-from glob import glob
-from os.path import basename
-from os.path import dirname
-from os.path import join
-from os.path import splitext
 
-from setuptools import find_packages
-from setuptools import setup
+from setuptools import find_packages, setup
 
 
 def read(*names, **kwargs):