Merge branch 'develop'

Conflicts:
	TODO.md
	dyssh/__init__.py
	dyssh/utils/__init__.py
Merge branch 'master' into interface

Conflicts:
	TODO.md
	dyssh/utils/__init__.py