Added omnom functionality
Updated help for !nom
Merge branch 'master' of https://github.com/kaarelj/marju2 into kaarelj-master

Conflicts:
	marjubot.py