Expose tree photo url in API
Merge pull request #78 from ahinz/fix/backport-photo-api

Expose tree photo url in API
fixed bad username resolve
fix username resolve
fix username resolve
Update README.md

It's been mentioned that OTM v1.2 is best run atop Django 1.3. As such, django-pipeline version 1.1.27 needs to be used
Updated the profiles url.py to account for a username with @ . -

Updated the profiles url.py to account for a username with @ . -

Updated the profiles url.py to account for a username with @ . -
Merge branch 'v1.2' of http://github.com/daveizm/OpenTreeMap into v1.2
Merge pull request #80 from daveizm/v1.2

V1.2
Update speciesimport.py

Remove hard-coded "OpenTreeMap" from "treemap.models"
Merge pull request #81 from kbornhorst/patch-1

Update README.md
Merge pull request #84 from kbornhorst/patch-2

Update speciesimport.py
Update uimport.py

Removed hard-coded, case-sensitive "OpenTreeMap" references; Added a comment related to the current mechanism for specifying choices (implementation-specific file like "impl_chioces.sql" that's added to settings.py)
Merge pull request #87 from kbornhorst/patch-4

Update uimport.py
Update update_aggregates.py

No need to specify "OpenTreeMap" (fails if root directory fails case sensitive match)
Make zip_code field hidden
Fix tree_count assignment on species save

On save, tree_count was assigned to the count of trees in the
tree_set property of the species model. This doesn't work for
a species that has no pk, as in the case of new species.

Stop this problem by only updating this count when pk == True

tree_count defaults to zero for new species, so the value will
be correct without this update anyway.
Merge pull request #92 from kbornhorst/patch-5

Update update_aggregates.py
Merge pull request #95 from steventlamb/topic/misc_bugs

Topic/misc bugs
Merge remote-tracking branch 'upstream/v1.2' into v1.2