忽略couchdb输出的日志文件
修订model-timeseries.html中误删括号，导致的语法错误
Merge branch 'master' of github.com:regoo/slycat

Conflicts:
	couchdb.stderr
	couchdb.stdout