Rename observationtypes to categories
Clean up migrations
Clean up migrations
Template bug fixes