work in progress
actually canonicalize
add toString for test ease
data fixes
add the GPG version
Actually test canonicalize
add diffKeyrings method
use KeyringTestHelper.diffKeyrings method for unit test

Conflicts:
	OpenKeychain/src/test/java/tests/UncachedKeyringTest.java
(c) headers, tidy imports
prevent odd ambiguous method toString error
actually provide a tostring
Merge remote-tracking branch 'artbristol/functional-testing-canonicalize-badsignature' into external-test

Conflicts:
	OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
tests: fix createkey test
use openjdk7 in travis