Fixed issue #17
Updated default config file
fixed typo
Merge branch 'master' of git://github.com/czardoz/beeswarm

Conflicts:
	hive.cfg.dist