cleaned up conflicts in campaign models
fixed conflicts again
docstrings for lobbying and fixed the date field lists that i turned to tuples on accident.
Merge branch 'master' of github.com:california-civic-data-coalition/django-calaccess-parser