more stuff, help text
conflicts
Merge branch 'master' of github.com:shacknetisp/fourthevaz

Conflicts:
	evazbot/modules/m_weather.py