Remove persistence.
Merge branch 'master' into issues/23

Conflicts:
	lexicon_test.go