Xiami: fix album & showcollect download error
fix README.*: Travis images
quick & dirty fix #61, default to use FFmpeg for merging flv files
version 0.3.5
Merge remote-tracking branch 'upstream/master' into upstream