Added in negation look up
Merge branch 'develop' of github.com:projecttacoma/bonnie into develop

Conflicts:
	app/assets/javascripts/templates/logic/population_criteria.hbs