Add virtualenv manpage
consolidate python canvas
consolidate django canvas
Add django templates
add pyramid canvas
Merge branch 'master' of https://github.com/wurde/canvas

Conflicts:
	ruby/canvas_django.rb
	ruby/canvas_python.rb