Merge pull request #16 from czardoz/master

added pyftpdlib-1.0.1 support
basic telnet and ssh tests
include cert and key for testing purposes
updated travis path
fix for travis shm issue
Merge branch 'master' of git://github.com/czardoz/beeswarm

Conflicts:
	hive.cfg.dist