premerge
Merge branch 'master' of https://github.com/brotoes/obamacare
lots of permissions stuff working