fix some problem
remove one test
Merge pull request #294 from youyong205/master

fix some problem
save before merge
Merge branch 'master' of https://github.com/dianping/cat