Merge pull request #356 from leonindy/master

refactor RuleType, change rules from list to map, change AlertInfo map
add 2 new RuleType for fluctuate case
Merge branch 'master' of https://github.com/dianping/cat