Merge branch 'master' into namespaced

This is a no-op merge, explicitly considering and rejecting the
submodules from the master branch.  After this merge, future merges
from the master branch will pick up any content changes.

  $ git merge --log --no-ff --strategy ours master

* master:
  exercises/hearing: Replace 2012-04-uchichicago commit with 2012-02-trieste
  exercises/genotype: Add the genotype example submodule
  exercises/dictionary: Add the dictionary example submodule