Get rid of STI, stop using type as a column name
Merge branch 'master' of github.com:gangleton/sflgbt-hack