updated ssh settings
Merge branch 'master' of github.com:micheloosterhof/kippo

Conflicts:
	kippo/core/honeypot.py