remove settings.py
finished edit profile section
Merge branch 'master' of https://github.com/crosscent/farm

Conflicts:
	vendors/forms.pyc
	vendors/models.pyc
	vendors/views.pyc