Major code refactoring

Also fixed some bugs along the way
Merge branch 'master' of github.com:fadillzzz/node-infobot

Conflicts:
	infobot.js
Database should not be commited
Removes crappy test case

We'll come up with a better one in the future