removing local configs from settings.py
Merge branch 'master' of https://github.com/martinezah/memexapi

Conflicts:
	api/settings.py