Merge w/ github generated stuff

.gitignore

@@ -1,49 +1,89 @@
-*.py[cod]
-
-# C extensions
-*.so
-
-# Packages
+*$py.class
+*.cover
+*.egg
 *.egg*
 *.egg-info
-dist
-build
-eggs
-parts
+*.egg-info/
+*.log
+*.manifest
+*.mo
+*.mo
+*.pot
+*.py[cod]
+*.py[cod]
+*.sage.py
+*.so
+*.spec
+*~
+.*.swp
+.*sw?
+.Python
+.cache
+.coverage
+.coverage*
+.coverage.*
+.eggs/
+.env
+.hypothesis/
+.installed.cfg
+.installed.cfg
+.ipynb_checkpoints
+.mypy_cache/
+.mypy_cache/
+.pytest_cache/
+.pytest_cache/
+.python-version
+.ropeproject
+.scrapy
+.spyderproject
+.spyproject
+.tox
+.tox/
+.venv
+.venv
+.webassets-cache
+/site
+ChangeLog
+ENV/
+__pycache__/
 bin
-var
-sdist
+build
+build/
+celerybeat-schedule
+cover/
+coverage.xml
+db.sqlite3
 develop-eggs
-.installed.cfg
+develop-eggs/
+dist
+dist/
+doc/build
+docs/_build/
+downloads/
+eggs
+eggs/
+env.bak/
+env/
+htmlcov/
+instance/
 lib
+lib/
 lib64
-
-# Installer logs
-pip-log.txt
-
-# Unit test / coverage reports
-cover/
-.coverage*
-.tox
-.venv
-.pytest_cache/
-.mypy_cache/
-
-# Translations
-*.mo
-
-# Complexity
+lib64/
+local_settings.py
+nosetests.xml
 output/*.html
 output/*/index.html
-
-# Sphinx
-doc/build
-
-# pbr
-AUTHORS
-ChangeLog
-
-# Editors
-*~
-.*.swp
-.*sw?
+parts
+parts/
+pip-delete-this-directory.txt
+pip-log.txt
+pip-log.txt
+sdist
+sdist/
+target/
+var
+var/
+venv.bak/
+venv/
+wheels/

LICENSE

@@ -22,4 +22,29 @@ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+=======
+BSD 2-Clause License
+
+Copyright (c) 2018, 
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.