First cut at message context support.
Make sure context is always used.
Fixup tests
Ignore vim swapfiles.
Merge branch 'i18n-context'