Security Patch
Merge pull request #19 from sambohler/master

Security Patch
make test/livenet configurable