Add stuff
Merge branch 'master' of github.com:iancmcc/ouimeaux.core

Conflicts:
	CONTRIBUTING.rst
	HISTORY.rst
	LICENSE
	Makefile
	README.rst
	docs/conf.py
	docs/index.rst
	docs/installation.rst
	docs/usage.rst
	requirements.txt
	setup.py
	tests/__init__.py
	tox.ini