Merge pull request #35 from murrekatt/develop

Integrated using opentxs from S3 for Travis CI.