Created new branch, added appropriate settings for python-social-auth
removed silly file
Adjusted settings for migrations and applied migrations
removed all python-social-auth lines
some debugging, bored
test commit
ran collectstatic, and created a requirements.txt file, still broken
Fixed indentation on settings.py
Merge branch 'social' of github.com:skeuomorf/directory into social
removed local.py and added it to gitignore
fixed site SITE_ID = 6  to 1,   I changed that earlier for other reasons
removing local.py
Fixed conflicts
 fixed the static files, deleted the static folder, because the static files are hosted at assets
Merge branch 'social' of github.com:skeuomorf/directory into social
added instant signup
Merge branch 'social' of github.com:skeuomorf/directory into social
adjusted SITE_ID to match DB, tried FB, Google, working but need web configurations
implemented maps, in single listing page, and search page
Added login_redirect_url