Merge pull request #148 from codeforboston/dev_postgres

Flagging website 1.2

Merge branch 'master' of https://github.com/codeforboston/flagging

Merge pull request #105 from codeforboston/dev_postgres

Dev postgres to master