added provinces
change province to location in migration
Merge branch 'master' of https://github.com/mule-deer-2013/OpenNGO into schema_update

Conflicts:
	solr/pids/development/sunspot-solr-development.pid
Merge pull request #13 from mule-deer-2013/schema_update

Schema update