fix backward compatibility
Merge branch 'spike/usetag' of github.com:siroken3/serf-master into spike/usetag

Conflicts:
	serf_master/__init__.py