Merge branch 'develop' of https://github.com/siddontang/ledisdb into develop

Conflicts:
	Makefile