reverting changes to queries, templates and views
Merge branch 'master' of https://github.com/brotoes/obamacare