small changes
Merge branch 'master' of github.com:makevoid/servtools

Conflicts:
	config/sites/main.rb