Added a gitignore file, so hopefully I'm not trashing hours worth of work!

Also, this should be the first push to the 'Tim' branch, which will help with collaboration w/Josh
Fixed a quick bug - user.id != profile.id!
Finishing off the userprofile app, it should be 95% functional by now, including email edits, admin edits of user profiles, and other goodies.
Added the new Farm Location app as a stub, it should be fleshed out but the details need to be fleshed out.
ladkfjalskjd
Merge branch 'Josh'

Conflicts:
	gleaning/settings.pyc
Added files to .gitignore, added minor functionality to farms/views.py
yo

settings.pyc is stupid
making sure settings files don't cross over
settings.py files
differences
Merge branch 'Tim'

Conflicts:
	constants.pyc
	farms/__init__.pyc
	farms/admin.pyc
	farms/models.pyc
	farms/urls.pyc
	farms/views.pyc
	gleanevent/__init__.pyc
	gleanevent/admin.pyc
	gleanevent/models.pyc
	gleanevent/urls.pyc
	gleanevent/views.pyc
	gleaning/__init__.pyc
	gleaning/settings.py
	gleaning/settings.pyc
	gleaning/urls.pyc
	gleaning/views.py
	gleaning/views.pyc
	gleaning/wsgi.pyc
	templates/home.html
	userprofile/__init__.pyc
	userprofile/admin.pyc
	userprofile/models.pyc
	userprofile/urls.pyc
	userprofile/views.pyc
Cleaning up the merger by hand, couple of issues still at-large
Merge branch 'master' of https://github.com/Cheekio/glean
with what? wtf?

Conflicts:
	.gitignore
adding this
adding settings.py