reworking haml for content_partners
removed junk file
added exemplars for show_content_partner_path
Reformatting, adding docs, extracting Solr start code
Adding an important exception to the Ruby Style Guide
Fixing a notifications bug.
Fixing (rarely) failing spec
Merge branch 'master' into exemplar_cp_view
Fixing another rarely-failing spec
Merge branch 'master' into exemplar_cp_model

Conflicts:
	spec/models/taxon_user_classification_filter_spec.rb