Wrap Evernote metadata in a <evernote> tag.
Update version info.
Merge branch 'devel'