Merge pull request #71 from ainilife/master

Refactor the code
Merge branch 'master' of github.com:dianping/cat into abtest
fix merge issues
Merge pull request #76 from unidal/abtest

promote from abtest