removed namespace contingency section and references

Merge branch 'master' into 1.0rc

use code:: python rather than parsed-literal:: to avoid errors in cer…

…tain ipython-generated files