Merge pull request #94 from czardoz/master

improvements to the ssh and telnet capabilities
Merge pull request #96 from czardoz/master

Initial work on #88 - Improving the UI
migrated to sqlalchemy
scope adjustments
beautified beekeeper forms
basic work on Beekeeper logins
Merge branch 'master' of git://github.com/czardoz/beeswarm into czardoz-master

Conflicts:
	beeswarm/beekeeper/tests/test_classifier.py
	beeswarm/beekeeper/tests/test_webapp.py
	beeswarm/beekeeper/webapp/app.py
fixed missing merge
Merge branch 'master' of https://github.com/honeynet/beeswarm