Added support for yaaw/aria2-jsonrpc
Merge pull request #1 from iambus/master

Merge with upstream
Merge branch 'master' of git://github.com/iambus/xunlei-lixian into iambus-master

Conflicts:
	lixian_commands/download.py
Catch exception in watch mode