fixed typo in builtins.txt
Merge pull request #1943 from jantokhine/master

fixed typo in builtins.txt
Added more examples to the get_object_or_404 documentation.
Recommended setuptools in the reuseable app tutorial.

setuptools has merged with distribute.
Changed shortcuts from being a package to just being a module
Use `classmethod` as a decorator.