test to see if this fixes the push problem
Merge branch 'master' of whometaxi.com:/home/fromageball2/django/taxiblog

Conflicts:
	blog/__init__.pyc
	blog/admin.pyc
	blog/feed.pyc
	blog/models.pyc
	blog/views.pyc
	taxiblog/__init__.pyc
	taxiblog/urls.pyc
	taxiblog/wsgi.pyc

trying to get rid of .pyc files
Merge https://github.com/fromageball/whometaxi

bring up to date...bring back settings.py for now the commit.
put relative path variables in for template settings in settings.py