Bring display of builtin types and functions in line with Py 2

I noticed that builtin types and function in Python 3 were displayed as `builtins.foo` and `<function builtins.bar>`. This brings their representation in line with Python 2.