Couple of fixes
Merge branch 'vk.unclev.ru'

Conflicts:
	.gitignore
	init.d/vk4xmpp