meh
modifications to dev branch
forgot file
Merge branch 'jeff-dev'

Conflicts:
	ircd/user.py