Added --rescan option to reset datadir.blkfile_*.
Merge branch 'master' of /home/jtobey/src/bitcoin-abe into trim