Syncing changes to broken google
Merge branch 'Broke_google' of https://github.com/GoogleJump/ninja

Conflicts:
	josh/proj/views.py
	josh/proj/views.pyc