start adding redirects
Merge branch 'redirects'

Conflicts:
	tinker/__init__.py