With --testnet, look for testnet directory in the right place
Merge pull request #8 from neldredge/master

With --testnet, look for testnet directory in the right place